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
..
acpi
asm-generic
crypto
drm	drm: Take lock around probes for drm_fb_helper_hotplug_event	2011-05-16 12:01:43 +10:00
keys
linux	Merge commit 'v2.6.39' into for-2.6.40/core	2011-05-20 20:33:15 +02:00
math-emu
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2011-04-27 15:17:52 -07:00
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-05-13 15:20:51 -07:00
pcmcia
rdma
rxrpc
scsi	scsi: remove performance regression due to async queue run	2011-05-17 11:04:44 +02:00
sound
staging
target
trace	mm: tracing: add missing GFP flags to tracing	2011-05-11 18:50:45 -07:00
video
xen
Kbuild