]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8fceee c69c089)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 20 Sep 2007 20:25:35 +0000 (13:25 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 20 Sep 2007 20:25:35 +0000 (13:25 -0700)
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] ahci: add ATI SB800 PCI IDs
  libata-sff: Fix documentation
  libata: Update the blacklist with a few more devices


Trivial merge
Linux 2.6 source tree