From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 25 May 2007 22:48:24 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.22-rc3~3
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=a41d7f000447015f3f5fe7223f1d53845268e2e8;p=powerpc.git

Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_hpt37x: Further improvements based on the IDE updates and vendor drivers
  pata: Trivia
  [libata] sata_via, pata_via: Add PCI IDs.
  [libata] Fix decoding of 6-byte commands
  libata: sata_sis fixes
  Fix build failure for drivers/ata/pata_scc.c
  [libata] sata_mv: add TODO list
  [libata] sata_promise: fix flags typo
---

a41d7f000447015f3f5fe7223f1d53845268e2e8