Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 15 Jan 2008 16:01:48 +0000 (08:01 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 15 Jan 2008 16:01:48 +0000 (08:01 -0800)
commitf885b51967fb5f611c462841e5119853df00cc97
tree29ba7f6eb9dd607980e63917e7f68e88578e7aca
parent5d5d80001df3fbd06bd2b8893b6e3847e38a12d6
parentdfbe0d3b6be52596b5694b1bb75b19562e769021
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] Fix boot failure on POWER6
  [POWERPC] Workaround for iommu page alignment