Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier
Conflicts:
	block/blk-core.c
	drivers/block/loop.c
	mm/swapfile.c
Signed-off-by: 
Jens Axboe <jaxboe@fusionio.com>
Loading
Please register or sign in to comment
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Conflicts:
	block/blk-core.c
	drivers/block/loop.c
	mm/swapfile.c
Signed-off-by: 
Jens Axboe <jaxboe@fusionio.com>