git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* '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


Trivial merge
Pandora Kernel Repository