tree 0ad09b551606771de5ec966170bdc6008cfa513c
parent 6483d152acffb83442b90dad1517fde8a7b1e12d
parent 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e
author Linus Torvalds <torvalds@linux-foundation.org> 1211555712 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1211555712 -0700

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