summaryrefslogtreecommitdiff
path: root/include/asm-blackfin/bfin-global.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-02 15:25:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-02 15:25:03 -0700
commitf365ad5fc001cbd02968a376e0aecffe52ce79e1 (patch)
tree8677f1409e36c30f0f105249a63bf11d3993f32f /include/asm-blackfin/bfin-global.h
parent61ac7bf538db2044d0238fcd87b3d9df59294bf2 (diff)
parent9c8b28c2ef532c2cf32b59aaa0bc07eb3b866ef7 (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix DMA nodes in the MPC8610 HPCD device tree [POWERPC] Export empty_zero_page and copy_page in arch/ppc [POWERPC] Add "memory" clobber to MMIO accessors [POWERPC] pasemi: update pasemi_defconfig, enable electra_cf electra_cf: Add MODULE_DEVICE_TABLE()
Diffstat (limited to 'include/asm-blackfin/bfin-global.h')
0 files changed, 0 insertions, 0 deletions