Skip to content
GitLab
Explore
Sign in
Register
xcap
xcap-capability-linux
Repository
xcap-capability-linux
drivers
ide
ide-lib.c
Find file
Blame
History
Permalink
Merge branch 'master' into for-2.6.31
· 9bd7de51
Jens Axboe
authored
May 22, 2009
Conflicts: drivers/ide/ide-io.c Signed-off-by:
Jens Axboe
<
jens.axboe@oracle.com
>
9bd7de51