]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Jun 2010 00:09:03 +0000 (17:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Jun 2010 00:09:03 +0000 (17:09 -0700)
commit4d3d769c605ebdf9fbb5a9d63827598b48351861
treeb71d8faa40a026b2ed68a24ab25ccfd514cf45f3
parentcfca31ce789963c0dd6ca2e9cc13b90cc2802fbd
parent0ee719527229fa86ace8e3abccae3c2a8bbfd6db
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:
  ahci: redo stopping DMA engines on empty ports
  sata_sil24: fix kernel panic on ARM caused by unaligned access in sata_sil24
  ahci: add pci quirk for JMB362
  sata_via: explain the magic fix