| commit | 4d3d769c605ebdf9fbb5a9d63827598b48351861 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 07 17:09:03 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 07 17:09:03 2010 -0700 |
| tree | b71d8faa40a026b2ed68a24ab25ccfd514cf45f3 | |
| parent | cfca31ce789963c0dd6ca2e9cc13b90cc2802fbd [diff] | |
| parent | 0ee719527229fa86ace8e3abccae3c2a8bbfd6db [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: 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