drivers/ide/ide-lib.c · a531cd69ada8c8b89f631b1b6ba246b5d84b5344 · xcap / xcap-capability-linux · GitLab

Snippets Groups Projects

15 years ago
9bd7de51
Merge branch 'master' into for-2.6.31 · 9bd7de51
Jens Axboe authored 15 years ago
```
Conflicts:
	drivers/ide/ide-io.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
```
9bd7de51

History
Merge branch 'master' into for-2.6.31
Jens Axboe authored 15 years ago
```
Conflicts:
	drivers/ide/ide-io.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
```