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

Merge branch 'for-linus' into for-3.1/core 



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

Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parents d2f31a5f 7b28afe0
Hide whitespace changes
Inline Side-by-side
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