]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7962024 459ad68)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Dec 2007 20:53:15 +0000 (12:53 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Dec 2007 20:53:15 +0000 (12:53 -0800)
commit94545baded0bfbabdc30a3a4cb48b3db479dd6ef
tree1ce09d319261627a03ce8ef75055f3f6a4a35ea7tree | snapshot
parent7962024e9d16e9349d76b553326f3fa7be64305ecommit | diff
parent459ad68893a84fb0881e57919340b97edbbc3dc7commit | diff
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: kill spurious NCQ completion detection
  ahci: don't attach if ICH6 is in combined mode
  ata_piix: add Toshiba Tecra M4 to broken suspend list
  ahci: fix engine reset failed message
Linux 2.6 source tree