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

Merge branch 'master' into for-2.6.31 



Conflicts:
	drivers/ide/ide-io.c

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