tree 29ba7f6eb9dd607980e63917e7f68e88578e7aca
parent 5d5d80001df3fbd06bd2b8893b6e3847e38a12d6
parent dfbe0d3b6be52596b5694b1bb75b19562e769021
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1200412908 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1200412908 -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] Fix boot failure on POWER6
  [POWERPC] Workaround for iommu page alignment