Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
commitc53ab5d56c66816fe06dc6cd0abb93f6dd81a145
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 20 Jun 2007 21:28:54 +0000 (20 14:28 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 20 Jun 2007 21:28:54 +0000 (20 14:28 -0700)
treeb7226c695fa41388955d864e4f026176917e9442
parent8acff0a2449aeda37204c4074976bf79f21968e3
parentc5f226c7e95bf318879fb6ae02fc0dfb0f6d408c
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 powermac late initcall to only run on powermac
  [POWERPC] PowerPC: Prevent data exception in kernel space (32-bit)