projects / profile / common / kernel-common.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1f0e14b 5040ab6)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jan 2010 04:56:20 +0000 (20:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jan 2010 04:56:20 +0000 (20:56 -0800)
commit2d13c8f0682bd38c74e89a76cc550f0324b610ba
tree8e2286479c18f5ee076d26ee44ff03b44d38a299tree | snapshot
parent1f0e14bbc065c88ddb68fec42b317f487cc85410commit | diff
parent5040ab67a2c6d5710ba497dc52a8f7035729d7b0commit | diff
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: retry link resume if necessary
  ata_piix: enable 32bit PIO on SATA piix
  sata_promise: don't classify overruns as HSM errors
Domain: SCM / Uncategorized;