From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 May 2008 15:15:12 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.26-rc4~61
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbff290491cd97bcd449b14f672d98992ddad5cb;p=linux-2.6

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

cbff290491cd97bcd449b14f672d98992ddad5cb