]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4da3dcf ab3b3fd)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Jul 2006 05:47:44 +0000 (22:47 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Jul 2006 05:47:44 +0000 (22:47 -0700)
commitdc710afe95ee9b263ab593c11d86a684f1606872
tree2b4ea32bed1a010a3046069dd834f62bc071c92ctree | snapshot
parent4da3dcf34671fa15c4f01101754106d97fc98e6ecommit | diff
parentab3b3fd38125be0242c2f94bf144b48054210882commit | 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] sata_promise: comment out duplicate PCI ID
  [PATCH] libata: improve EH action and EHI flag handling
  [PATCH] libata: fix eh_skip_recovery condition
  [PATCH] libata: fix autopsy ehc->i.action and ehc->i.dev handling
Linux 2.6 source tree