Merge commit 'v2.6.38-rc6' into for-2.6.39/core
authorJens Axboe <jaxboe@fusionio.com>
Tue, 1 Mar 2011 20:04:39 +0000 (15:04 -0500)
committerJens Axboe <jaxboe@fusionio.com>
Tue, 1 Mar 2011 20:04:39 +0000 (15:04 -0500)
commit6fae9c25134baffbeeb20031479e7ff6f6d8eec0
treec9ab89992ce5293a43cd455a81dc8a5926a28a5e
parentc186794dbb466b45cf40f942f2d09d6d5b4b0e42
parentf5412be599602124d2bdd49947b231dd77c0bf99
Merge commit 'v2.6.38-rc6' into for-2.6.39/core

Conflicts:
block/cfq-iosched.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
block/blk-core.c
block/cfq-iosched.c
include/linux/blkdev.h
include/linux/elevator.h