summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/fsldma.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-04 00:46:37 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-04 00:46:37 +0200
commit39059cceeda478cd040d521b9541d1113035c908 (patch)
tree56adf04d6766a4346160aacd709468e5b2f1b879 /arch/powerpc/include/asm/fsldma.h
parentMerge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/... (diff)
parentpowerpc/macio: Fix probing of macio devices by using the right of match table (diff)
downloadlinux-39059cceeda478cd040d521b9541d1113035c908.tar.xz
linux-39059cceeda478cd040d521b9541d1113035c908.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/macio: Fix probing of macio devices by using the right of match table agp/uninorth: Fix oops caused by flushing too much powerpc/pasemi: Update MAINTAINERS file powerpc/cell: Fix integer constant warning powerpc/kprobes: Remove resume_execution() in kprobes powerpc/macio: Don't dereference pointer before null check
Diffstat (limited to 'arch/powerpc/include/asm/fsldma.h')
0 files changed, 0 insertions, 0 deletions