Skip to content
Snippets Groups Projects
Commit 6fae9c25 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge commit 'v2.6.38-rc6' into for-2.6.39/core


Conflicts:
	block/cfq-iosched.c

Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parents c186794d f5412be5
No related branches found
No related tags found
Loading
Showing
with 327 additions and 38 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment