Linus Torvalds
f063a0c0c9
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (841 commits)
Staging: brcm80211: fix usage of roundup in structures
Staging: bcm: fix up network device reference counting
Staging: keucr: fix up US_ macro change
staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames.
staging: brcm80211: Remove unnecessary header files.
staging: brcm80211: Remove unnecessary includes from bcmutils.c
staging: brcm80211: Removed unnecessary pktsetprio() function.
Staging: brcm80211: remove typedefs.h
Staging: brcm80211: remove uintptr typedef usage
Staging: hv: remove struct vmbus_channel_interface
Staging: hv: remove Open from struct vmbus_channel_interface
Staging: hv: storvsc: call vmbus_open directly
Staging: hv: netvsc: call vmbus_open directly
Staging: hv: channel: export vmbus_open to modules
Staging: hv: remove Close from struct vmbus_channel_interface
Staging: hv: netvsc: call vmbus_close directly
Staging: hv: storvsc: call vmbus_close directly
Staging: hv: channel: export vmbus_close to modules
Staging: hv: remove SendPacket from struct vmbus_channel_interface
Staging: hv: storvsc: call vmbus_sendpacket directly
...
Fix up conflicts in
drivers/staging/cx25821/cx25821-audio-upstream.c
drivers/staging/cx25821/cx25821-audio.h
due to warring whitespace cleanups (neither of which were all that great)
|
2010-10-28 12:13:00 -07:00 |
| .. |
|
acpi
|
Merge branch 'misc' into release
|
2010-10-26 14:51:00 -04:00 |
|
asm-generic
|
taskstats: use real microsecond granularity for CPU times
|
2010-10-27 18:03:17 -07:00 |
|
crypto
|
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
|
2010-10-24 13:41:39 -07:00 |
|
drm
|
Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next
|
2010-10-26 09:23:22 +10:00 |
|
keys
|
|
|
|
linux
|
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
|
2010-10-28 12:13:00 -07:00 |
|
math-emu
|
|
|
|
media
|
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
|
2010-10-28 09:35:11 -07:00 |
|
mtd
|
|
|
|
net
|
9p: Add datasync to client side TFSYNC/RFSYNC for dotl
|
2010-10-28 09:08:49 -05:00 |
|
pcmcia
|
pcmcia: IOCARD is also required for using IRQs
|
2010-10-22 08:46:36 +02:00 |
|
rdma
|
IB/core: Add VLAN support for IBoE
|
2010-10-25 10:20:39 -07:00 |
|
rxrpc
|
|
|
|
scsi
|
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
|
2010-10-26 17:54:22 -07:00 |
|
sound
|
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
|
2010-10-25 08:32:05 -07:00 |
|
trace
|
Merge branch 'next' into upstream-merge
|
2010-10-27 23:44:47 -04:00 |
|
video
|
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
|
2010-10-25 08:32:05 -07:00 |
|
xen
|
Merge branches 'upstream/xenfs' and 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
|
2010-10-26 18:20:19 -07:00 |
|
Kbuild
|
|
|