tree ff6d41695b8d715c9a96e2cd5674cf7da398ea51
parent 064e38aaded5269e573ac1c765284fd65c8ebd13
parent a3cb900cc408977a11519bc7c760f3e499079589
author Linus Torvalds <torvalds@linux-foundation.org> 1244315823 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1244315823 -0700

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