| commit | 9ccb1aa16cef6316831fef61e4aeaa3784035cb8 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 6 Jun 2009 19:17:03 +0000 (6 12:17 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 6 Jun 2009 19:17:03 +0000 (6 12:17 -0700) | ||
| tree | ff6d41695b8d715c9a96e2cd5674cf7da398ea51 | treesnapshot (tar.gz zip) |
| parent | 064e38aaded5269e573ac1c765284fd65c8ebd13 | commitdiff |
| parent | a3cb900cc408977a11519bc7c760f3e499079589 | commitdiff |
Merge branch 'upstream-linus2' of git://git./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
* 'upstream-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] pata_ali: Use IGN_SIMPLEX