summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-07 17:09:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-07 17:09:03 -0700
commit4d3d769c605ebdf9fbb5a9d63827598b48351861 (patch)
treeb71d8faa40a026b2ed68a24ab25ccfd514cf45f3 /fs
parentcfca31ce789963c0dd6ca2e9cc13b90cc2802fbd (diff)
parent0ee719527229fa86ace8e3abccae3c2a8bbfd6db (diff)
downloadop-kernel-dev-4d3d769c605ebdf9fbb5a9d63827598b48351861.zip
op-kernel-dev-4d3d769c605ebdf9fbb5a9d63827598b48351861.tar.gz
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud