From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 8 Jul 2007 19:14:27 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.22~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fe5a2de17e65d82b9d502da80ccb5a689d03fdd2;p=~emulex%2Finfiniband.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  qd65xx: fix PIO mode selection
  sis5513: adding PCI-ID
---

fe5a2de17e65d82b9d502da80ccb5a689d03fdd2