Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Dec 2008 00:41:15 +0000 (16:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Dec 2008 00:41:15 +0000 (16:41 -0800)
commita771132783d3f78a51597fdcee96c6dfbae3512e
tree3d3210a247e673b44e64a04b2c94d68126d73872
parent2433c41789d6aa6797ca747707b7764e88e4fb6d
parentdafdb61313e80e20cfeef7bf4653dcb47cf28591
Merge branch 'merge' of git://git./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