tree ea9e97afd3aca46c16b77468ef91e5e39d36ed7f
parent 3e847423bf029c2170692c75580a856debed617b
parent 67439b76f29cb278bb3412fc873b980fc65110c9
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1186179393 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1186179393 -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] Fixes for the SLB shadow buffer code
  [POWERPC] Fix a compile warning in powermac/feature.c
  [POWERPC] Fix a compile warning in pci_32.c
  [POWERPC] Fix parse_drconf_memory() for 64-bit start addresses
  [POWERPC] Fix num_cpus calculation in smp_call_function_map()
  [POWERPC] ps3: Fix section mismatch in ps3/setup.c
  [POWERPC] spufs: Fix affinity after introduction of node_allowed() calls
  [POWERPC] Fix special PTE code for secondary hash bucket
  [POWERPC] Expand RPN field to 34 bits when using 64k pages