Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit fa251f89 authored by Jens Axboe's avatar Jens Axboe
Browse files

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: default avatarJens Axboe <jaxboe@fusionio.com>
parents dd3932ed cd07202c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment