tree fe0a447b6859a35a3cee1c91c105fc95bb6e4965
parent 2a1dc509747fdcfdf3a2df818a14908aed86c3d4
parent a1e0eb104249817e5251bd4aade50921ffcb2159
author Linus Torvalds <torvalds@linux-foundation.org> 1228147103 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228147103 -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 build for 32-bit SMP configs