Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Dec 2008 15:58:23 +0000 (07:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Dec 2008 15:58:23 +0000 (07:58 -0800)
commitecf318cc3daee6f41354cc781e2d4b766f7eec3e
treefe0a447b6859a35a3cee1c91c105fc95bb6e4965
parent2a1dc509747fdcfdf3a2df818a14908aed86c3d4
parenta1e0eb104249817e5251bd4aade50921ffcb2159
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 build for 32-bit SMP configs