]> err.no Git - linux-2.6/commit
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)
commit335fb8fc71692830aca0a5a5fe7f60016ee0d0aa
tree909e8c07f953d7d81cc4daebfe937a95966d432b
parentb8fceee17a310f189188599a8fa5e9beaff57eb0
parentc69c0892d8dd68b01a9fced5cab8527f0698c15e
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

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