From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 15 Jan 2008 16:01:48 +0000 (-0800)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.24-rc8~8
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f885b51967fb5f611c462841e5119853df00cc97;p=linux-2.6-omap-h63xx.git

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
---

f885b51967fb5f611c462841e5119853df00cc97