From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Jun 2009 19:17:03 +0000 (-0700)
Subject: Merge branch 'upstream-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarz... 
X-Git-Tag: Ubuntu-5.0.0-8.9~27334
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9ccb1aa16cef6316831fef61e4aeaa3784035cb8;p=mirror_ubuntu-disco-kernel.git

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
---

9ccb1aa16cef6316831fef61e4aeaa3784035cb8