diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-06 21:17:03 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-06 21:17:03 +0200 |
commit | 9ccb1aa16cef6316831fef61e4aeaa3784035cb8 (patch) | |
tree | ff6d41695b8d715c9a96e2cd5674cf7da398ea51 /drivers/dio/dio.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff) | |
parent | [libata] pata_ali: Use IGN_SIMPLEX (diff) | |
download | linux-9ccb1aa16cef6316831fef61e4aeaa3784035cb8.tar.xz linux-9ccb1aa16cef6316831fef61e4aeaa3784035cb8.zip |
Merge branch 'upstream-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] pata_ali: Use IGN_SIMPLEX
Diffstat (limited to 'drivers/dio/dio.c')
0 files changed, 0 insertions, 0 deletions