Merge commit 'v2.6.39' into for-2.6.40/core
Jens Axboe [Fri, 20 May 2011 18:33:15 +0000 (20:33 +0200)]
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>

1  2 
block/blk-sysfs.c
block/blk.h
block/elevator.c
include/linux/blkdev.h

Simple merge
diff --cc block/blk.h
Simple merge
Simple merge
Simple merge