]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 638944a c7843e8)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Jul 2008 16:52:54 +0000 (09:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Jul 2008 16:52:54 +0000 (09:52 -0700)
commita926c063738f31c8c8b5c2b883812a40e7868072
tree6f54fa70f43f747c7776e62afd3abeac20f1a82btree | snapshot
parent638944adc169b3164399a7c1aa98bb48fa070e41commit | diff
parentc7843e8f565f624b0cff7cad1370fad4cb84dfbccommit | diff
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_mv: safer logic for limit_warnings
  libata-sff: improve HSM violation reporting
  ahci: always clear all bits in irq_stat
  sata_sil24: add DID for another adaptec flavor
  sata_uli: hardreset is broken
Linux 2.6 source tree