Jens Axboe 698567f3fa Merge commit 'v2.6.39' into for-2.6.40/core ... Since for-2.6.40/core was forked off the 2.6.39 devel tree, we've had churn in the core area that makes it difficult to handle patches for eg cfq or blk-throttle. Instead of requiring that they be based in older versions with bugs that have been fixed later in the rc cycle, merge in 2.6.39 final. Also fixes up conflicts in the below files. Conflicts: drivers/block/paride/pcd.c drivers/cdrom/viocd.c drivers/ide/ide-cd.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>		2011-05-20 20:33:15 +02:00
..
accessibility
acpi
amba
ata	Merge commit 'v2.6.39' into for-2.6.40/core	2011-05-20 20:33:15 +02:00
atm	drivercore: revert addition of of_match to struct device	2011-05-18 12:32:23 -06:00
auxdisplay
base
block	Merge commit 'v2.6.39' into for-2.6.40/core	2011-05-20 20:33:15 +02:00
bluetooth
cdrom	Merge commit 'v2.6.39' into for-2.6.40/core	2011-05-20 20:33:15 +02:00
char	drivercore: revert addition of of_match to struct device	2011-05-18 12:32:23 -06:00
clk
clocksource
connector
cpufreq
cpuidle
crypto
dca
dio
dma
edac	drivercore: revert addition of of_match to struct device	2011-05-18 12:32:23 -06:00
eisa
firewire
firmware
gpio
gpu	drm: Take lock around probes for drm_fb_helper_hotplug_event	2011-05-16 12:01:43 +10:00
hid
hwmon
hwspinlock
i2c	drivercore: revert addition of of_match to struct device	2011-05-18 12:32:23 -06:00
ide	Merge commit 'v2.6.39' into for-2.6.40/core	2011-05-20 20:33:15 +02:00
idle
ieee802154
infiniband
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-05-12 10:41:31 -07:00
isdn
leds	drivers/leds/leds-lm3530.c: add MODULE_DEVICE_TABLE	2011-05-18 02:55:22 -07:00
lguest
macintosh
mca
md
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2011-05-18 03:16:38 -07:00
memstick
message
mfd	mfd: Fix for the TWL4030 PM sleep/wakeup sequence	2011-05-11 11:09:58 +02:00
misc
mmc	drivercore: revert addition of of_match to struct device	2011-05-18 12:32:23 -06:00
mtd	drivercore: revert addition of of_match to struct device	2011-05-18 12:32:23 -06:00
net	drivercore: revert addition of of_match to struct device	2011-05-18 12:32:23 -06:00
nfc
nubus
of
oprofile
parisc
parport
pci	PCI: Clear bridge resource flags if requested size is 0	2011-05-16 18:33:35 -07:00
pcmcia
platform	eeepc-laptop: Use ACPI handle to identify rfkill port	2011-05-09 10:48:47 -04:00
pnp
power
pps
ps3
rapidio	rapidio: fix default routing initialization	2011-05-18 02:55:22 -07:00
regulator
rtc	Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-05-17 08:02:04 -07:00
s390	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2011-05-18 06:49:02 -07:00
sbus
scsi	Merge commit 'v2.6.39' into for-2.6.40/core	2011-05-20 20:33:15 +02:00
sfi
sh
sn
spi
ssb
staging
target
tc
telephony
thermal
tty	drivercore: revert addition of of_match to struct device	2011-05-18 12:32:23 -06:00
uio
usb	drivercore: revert addition of of_match to struct device	2011-05-18 12:32:23 -06:00
uwb
vhost
video	Merge branch 'fbmem'	2011-05-14 11:24:32 -07:00
virtio
vlynq
w1
watchdog	drivercore: revert addition of of_match to struct device	2011-05-18 12:32:23 -06:00
xen
zorro
Kconfig
Makefile