Merge branch 'for-linus' into for-3.1/core
authorJens Axboe <jaxboe@fusionio.com>
Fri, 1 Jul 2011 14:17:13 +0000 (16:17 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Fri, 1 Jul 2011 14:17:13 +0000 (16:17 +0200)
commit04bf7869ca0fd12009aee301cac2264a36df4d98
tree66cb81ebf8b76560a31433c2c493dc430c914af9
parentd2f31a5fd60d168b00fc4f7617b68a1287b21e90
parent7b28afe01ab6ffb5f152f47831b44933facd2328
Merge branch 'for-linus' into for-3.1/core

Conflicts:
block/blk-throttle.c
block/cfq-iosched.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
block/blk-ioc.c
block/cfq-iosched.c
block/genhd.c
fs/partitions/check.c
include/linux/blkdev.h