Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
commitcbff290491cd97bcd449b14f672d98992ddad5cb
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 May 2008 15:15:12 +0000 (23 08:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 May 2008 15:15:12 +0000 (23 08:15 -0700)
tree0ad09b551606771de5ec966170bdc6008cfa513c
parent6483d152acffb83442b90dad1517fde8a7b1e12d
parent8962cadbe7cbc4ed0fff94f56ebab505a10afd2e
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] iSeries: Remove unused mail address
  [POWERPC] mpic: Fix use of uninitialized variable
  [POWERPC] Add kernstart_addr to list of allowed symbols in prom_init
  [POWERPC] Fix __set_fixmap() for STRICT_MM_TYPECHECKS
  [POWERPC] PS3: Fix memory hotplug