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

Merge branch 'master' into for-2.6.31 



Conflicts:
	drivers/block/hd.c
	drivers/block/mg_disk.c

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