Linus Torvalds 949f6711b8 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 ... * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits) staging: speakup: fix failure handling staging: usbip: remove double giveback of URB Staging: batman-adv: Remove batman-adv from staging Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize staging: hv: remove unneeded osd_schedule_callback staging: hv: convert channel_mgmt.c to not call osd_schedule_callback staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback staging: brcm80211: Fix WL_<type> logging macros Staging: IIO: DDS: AD9833 / AD9834 driver Staging: IIO: dds.h convenience macros Staging: IIO: Direct digital synthesis abi documentation staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr staging: brcm80211: Remove unused ether_<foo> #defines and struct staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR Staging: comedi: Fix checkpatch.pl issues in file s526.c ... Fix up trivial conflict in drivers/video/udlfb.c		2011-01-10 16:04:53 -08:00
..
accessibility
acpi	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
amba
ata	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2011-01-10 08:22:33 -08:00
atm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-04 11:57:25 -08:00
auxdisplay
base	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2011-01-10 08:15:37 -08:00
block	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
bluetooth
cdrom
char	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6	2011-01-10 11:18:59 -08:00
clk
clocksource
connector
cpufreq
cpuidle	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
crypto
dca
dio
dma	dma: shdma: don't register the global die notifier multiple times	2011-01-07 11:03:26 +09:00
edac	Merge branch 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp	2011-01-07 14:54:03 -08:00
eisa
firewire
firmware
gpio	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
gpu	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2011-01-10 08:15:37 -08:00
hwmon	hwmon: Support for Dallas Semiconductor DS620	2011-01-09 09:10:10 -08:00
i2c
ide
idle
ieee802154
infiniband	Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin	2011-01-07 08:56:33 -08:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2011-01-10 08:15:37 -08:00
isdn	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
leds	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
lguest
macintosh	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
mca
md
media	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
memstick
message
mfd	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
misc	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2011-01-10 08:57:03 -08:00
mmc	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2011-01-10 08:57:03 -08:00
mtd	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2011-01-10 08:57:03 -08:00
net	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2011-01-10 08:57:03 -08:00
nubus
of	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2011-01-10 08:57:03 -08:00
oprofile
parisc
parport
pci	headers: kobject.h redux	2011-01-10 08:51:44 -08:00
pcmcia	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
platform	sony-laptop: support new hotkeys on the P, Z and EC series	2011-01-10 12:00:22 -05:00
pnp
power
pps
ps3
rapidio
regulator
rtc	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
s390	headers: kobject.h redux	2011-01-10 08:51:44 -08:00
sbus
scsi	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2011-01-10 08:22:33 -08:00
serial	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2011-01-10 08:57:03 -08:00
sfi
sh	headers: kobject.h redux	2011-01-10 08:51:44 -08:00
sn
spi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6	2011-01-10 08:14:53 -08:00
ssb
staging	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-01-10 16:04:53 -08:00
tc
telephony
thermal
tty	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-01-07 14:39:20 -08:00
uio
usb	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-01-10 16:04:53 -08:00
uwb
vhost
video	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-01-10 16:04:53 -08:00
virtio
vlynq
w1
watchdog	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-01-06 16:50:35 -08:00
xen	Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-10 08:48:46 -08:00
zorro
Kconfig
Makefile	Merge branch 'smp' into misc	2011-01-06 22:32:03 +00:00