Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux...

diff --combined arch/powerpc/Kconfig
index 5342f3fdb0838ffea0a3f0f6e10c47b1611774c5,18102163e7dc837982ac3e4876a73fc0714342b7..b29adaa97348df0acf16a56fcd38ccd1d87671bb
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -338,6 -338,10 +338,6 @@@ config PPC_MULTIPLATFOR
          RS/6000 machine, an Apple machine, or a PReP, CHRP,
          Maple or Cell-based machine.
  
 -config PPC_ISERIES
 -      bool "IBM Legacy iSeries"
 -      depends on PPC64
 -
  config EMBEDDED6xx
        bool "Embedded 6xx/7xx/7xxx-based board"
        depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
@@@ -361,10 -365,6 +361,10 @@@ config PPC_PSERIE
        select PPC_UDBG_16550
        default y
  
 +config PPC_ISERIES
 +      bool "IBM Legacy iSeries"
 +      depends on PPC_MULTIPLATFORM && PPC64
 +
  config PPC_CHRP
        bool "Common Hardware Reference Platform (CHRP) based machines"
        depends on PPC_MULTIPLATFORM && PPC32
@@@ -594,6 -594,7 +594,7 @@@ endmen
  
  source arch/powerpc/platforms/embedded6xx/Kconfig
  source arch/powerpc/platforms/4xx/Kconfig
+ source arch/powerpc/platforms/82xx/Kconfig
  source arch/powerpc/platforms/83xx/Kconfig
  source arch/powerpc/platforms/85xx/Kconfig
  source arch/powerpc/platforms/86xx/Kconfig
@@@ -731,10 -732,11 +732,10 @@@ config ARCH_SPARSEMEM_DEFAUL
        def_bool y
        depends on SMP && PPC_PSERIES
  
 -source "mm/Kconfig"
 -
 -config HAVE_ARCH_EARLY_PFN_TO_NID
 +config ARCH_POPULATES_NODE_MAP
        def_bool y
 -      depends on NEED_MULTIPLE_NODES
 +
 +source "mm/Kconfig"
  
  config ARCH_MEMORY_PROBE
        def_bool y
@@@ -1069,7 -1071,7 +1070,7 @@@ source "arch/powerpc/oprofile/Kconfig
  
  config KPROBES
        bool "Kprobes (EXPERIMENTAL)"
 -      depends on PPC64 && EXPERIMENTAL && MODULES
 +      depends on PPC64 && KALLSYMS && EXPERIMENTAL && MODULES
        help
          Kprobes allows you to trap at almost any kernel address and
          execute a callback function.  register_kprobe() establishes