aboutsummaryrefslogtreecommitdiff
path: root/include/asm-arm/dma.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-11 09:52:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-11 09:52:45 -0700
commit633331f389c2d9c631371d09a54626a5e4749452 (patch)
tree6cd80edd1075635c64e612cc48e778e66795ea3a /include/asm-arm/dma.h
parent5bb7ff795fffc9418e3039cac77b42adcaae1a57 (diff)
parent005b1f7495e812b99b73de5adbc73afd7a1cbcaf (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: [libata] revert new check-ready Status register logic
Diffstat (limited to 'include/asm-arm/dma.h')
0 files changed, 0 insertions, 0 deletions