drivers/ide/ide-lib.c · c9059598ea8981d02356eead3188bf7fa4d717b8 · Kirill Smelkov / linux · GitLab

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

ide-lib.c 4.36 KB