Conflicts:
	block/blk-core.c
	drivers/block/loop.c
	mm/swapfile.c
Signed-off-by: NJens Axboe <jaxboe@fusionio.com>