Merge commit 'v2.6.39' into for-2.6.40/core
authorJens Axboe <jaxboe@fusionio.com>
Fri, 20 May 2011 18:33:15 +0000 (20:33 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Fri, 20 May 2011 18:33:15 +0000 (20:33 +0200)
commit698567f3fa790fea37509a54dea855302dd88331
tree7a1df976a0eb12cab03e82c18809a30d5482fee4
parentd70d0711edd8076ec2ce0ed109106e2df950681b
parent61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf
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>
block/blk-sysfs.c
block/blk.h
block/elevator.c
include/linux/blkdev.h