| commit | 9ccb1aa16cef6316831fef61e4aeaa3784035cb8 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 06 12:17:03 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 06 12:17:03 2009 -0700 |
| tree | ff6d41695b8d715c9a96e2cd5674cf7da398ea51 | |
| parent | 064e38aaded5269e573ac1c765284fd65c8ebd13 [diff] | |
| parent | a3cb900cc408977a11519bc7c760f3e499079589 [diff] |
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