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

Skip to content
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
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