aboutsummaryrefslogtreecommitdiff
path: root/arch/m32r/include/asm/types.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-16 14:42:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-16 14:42:04 -0700
commitc19f83669a02d4fa047d0d40f518e90f6f19c4c6 (patch)
tree5cf1113408afbe617a39a1ccaed7860bab6193d2 /arch/m32r/include/asm/types.h
parent05fa199d45c54a9bda7aa3ae6537253d6f097aa9 (diff)
parente3cf95dd6d352954b663d2934110d6e30af2406d (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: ata: Report 16/32bit PIO as best we can libata: use ATA_ID_CFA_* pata_legacy: fix no device fail path pata_hpt37x: fix HPT370 DMA timeouts libata: handle SEMB signature better
Diffstat (limited to 'arch/m32r/include/asm/types.h')
0 files changed, 0 insertions, 0 deletions