tree 3f7fe779941e3b6d67754dd7c44a32f48ea47c74
parent dd3932eddf428571762596e17b65f5dc92ca361b
parent cd07202cc8262e1669edff0d97715f3dd9260917
author Jens Axboe <jaxboe@fusionio.com> 1287472384 +0200
committer Jens Axboe <jaxboe@fusionio.com> 1287472384 +0200

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>