Greg Kroah-Hartman f341dddf1d Staging: merge staging patches into Linus's main branch ... There were a number of patches that went into Linus's tree already that conflicted with other changes in the staging branch. This merge resolves those merge conflicts. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2010-03-04 08:39:02 -08:00
..
accessibility
acpi	Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-03-03 08:15:37 -08:00
amba
ata	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2010-03-01 13:04:58 -08:00
atm
auxdisplay
base	PM: Allow device drivers to use dpm_wait()	2010-02-26 20:39:11 +01:00
block	Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block	2010-03-01 09:00:29 -08:00
bluetooth	Bluetooth: Convert Marvell driver to use per adapter debugfs	2010-02-27 14:05:38 +01:00
cdrom	block: Consolidate phys_segment and hw_segment limits	2010-02-26 13:58:08 +01:00
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-03-03 08:48:58 -08:00
clocksource	Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-03-01 08:48:25 -08:00
connector	connector: Delete buggy notification code.	2010-02-02 15:58:48 -08:00
cpufreq
cpuidle
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2010-02-26 16:50:02 -08:00
dca
dio
dma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2010-03-03 07:34:18 -08:00
edac	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp	2010-03-03 09:25:37 -08:00
eisa
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2010-03-03 08:08:44 -08:00
firmware	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2010-02-28 19:23:06 -08:00
gpio
gpu	Merge branch 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-02-28 10:59:18 -08:00
hid	USB: Push BKL on open down into the drivers	2010-03-02 14:54:23 -08:00
hwmon	Merge commit 'origin/master' into next	2010-02-17 10:00:42 +11:00
i2c	i2c: Document the message size limit	2010-03-02 12:23:49 +01:00
ide	Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-03-01 10:36:22 -08:00
idle
ieee1394	block: Rename blk_queue_max_sectors to blk_queue_max_hw_sectors	2010-02-26 13:58:08 +01:00
ieee802154
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2010-03-03 07:33:17 -08:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-03-01 10:38:09 -08:00
isdn	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2010-02-28 19:23:06 -08:00
leds
lguest
macintosh	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-03-01 10:38:09 -08:00
mca
md	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2010-03-03 07:34:18 -08:00
media	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-03-03 08:48:58 -08:00
memstick	block: Consolidate phys_segment and hw_segment limits	2010-02-26 13:58:08 +01:00
message	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-03-02 07:55:08 -08:00
mfd	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
misc
mmc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2010-03-03 08:47:22 -08:00
mtd	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
net	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2010-03-03 07:33:17 -08:00
nubus
of	of: move definition of of_chosen into common code.	2010-02-14 07:13:55 -07:00
oprofile
parisc
parport	serial: 8250_pci: add support for MCS9865 / SYBA 6x Serial Port Card	2010-03-02 14:43:08 -08:00
pci	Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-03-03 08:15:05 -08:00
pcmcia	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus	2010-02-27 16:19:22 -08:00
platform	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86	2010-03-03 07:41:24 -08:00
pnp
power	wm97xx_battery: Handle missing platform data gracefully	2010-01-29 17:00:18 +03:00
pps
ps3	powerpc: Remove trailing space in messages	2010-02-09 13:56:23 +11:00
rapidio
regulator	regulator/lp3971: vol_map out of bounds in lp3971_{ldo,dcdc}_set_voltage()	2010-02-12 11:39:49 +00:00
rtc	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-03-01 09:15:15 -08:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-03-02 07:55:08 -08:00
sbus	Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree	2010-01-28 14:38:25 -07:00
scsi	Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block	2010-03-01 09:00:29 -08:00
serial	jsm: fixing error if the driver fails to load	2010-03-02 14:43:24 -08:00
sfi
sh	sh: Use dummy_irq_chip for INTC redirect vectors.	2010-02-17 12:37:42 +09:00
sn
spi	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
ssb	ssb: Add PCI ID 0x4322 to PHU handling	2010-02-19 15:52:51 -05:00
staging	Staging: merge staging patches into Linus's main branch	2010-03-04 08:39:02 -08:00
tc
telephony
thermal
uio
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-03-03 08:48:58 -08:00
uwb
vhost	vhost-net: restart tx poll on sk_sndbuf full	2010-02-28 19:50:33 +02:00
video	Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux	2010-03-02 10:41:26 -08:00
virtio	virtio: fix out of range array access	2010-02-28 20:39:11 +02:00
vlynq
w1	omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3	2010-02-15 09:27:02 -08:00
watchdog	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
xen	xen: Remove unnecessary arch specific xen irq functions.	2010-02-18 17:17:58 -08:00
zorro
Kconfig
Makefile