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

Skip to content
Commit 7f03292e authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'master' into for-2.6.34 



Conflicts:
	include/linux/blkdev.h

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