Skip to content
GitLab
Commit 4facdaec authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'master' into for-2.6.35 



Conflicts:
	block/blk-cgroup.c
	block/cfq-iosched.c

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parents a11cdaa7 0d0fb0f9
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