]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9b08b9 960c8a1)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 25 May 2007 22:48:24 +0000 (15:48 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 25 May 2007 22:48:24 +0000 (15:48 -0700)
* '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


Trivial merge
Linux 2.6 source tree