tree 3d3210a247e673b44e64a04b2c94d68126d73872
parent 2433c41789d6aa6797ca747707b7764e88e4fb6d
parent dafdb61313e80e20cfeef7bf4653dcb47cf28591
author Linus Torvalds <torvalds@linux-foundation.org> 1228351275 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228351275 -0800

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/83xx: Fix MCU support merge issue in mpc8349emitx.dts
  powerpc: Fix dma_map_sg() cache flushing on non coherent platforms