Skip to content
GitLab
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
Expand all Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment