tree b71d8faa40a026b2ed68a24ab25ccfd514cf45f3
parent cfca31ce789963c0dd6ca2e9cc13b90cc2802fbd
parent 0ee719527229fa86ace8e3abccae3c2a8bbfd6db
author Linus Torvalds <torvalds@linux-foundation.org> 1275955743 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1275955743 -0700

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