Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
  [PARISC] slub: fix panic with DISCONTIGMEM
  [PARISC] set memory ranges in N_NORMAL_MEMORY when onlined

diff --combined init/Kconfig
index 7a71e0a9992a13cd5e05c52c1d1a4ca4fa4ea6c4,a7ad8fbdb564f4cc2b2b531200d1678e812b5322..d886b1e9278e32e2fcffd5fb4005ee16a7061a33
--- 1/init/Kconfig
--- 2/init/Kconfig
+++ b/init/Kconfig
@@@ -924,6 -924,14 +924,6 @@@ menuconfig EXPER
            environments which can tolerate a "non-standard" kernel.
            Only use this if you really know what you are doing.
  
 -config EMBEDDED
 -      bool "Embedded system"
 -      select EXPERT
 -      help
 -        This option should be enabled if compiling the kernel for
 -        an embedded system so certain expert options are available
 -        for configuration.
 -
  config UID16
        bool "Enable 16-bit UID system calls" if EXPERT
        depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION)
@@@ -1096,14 -1104,6 +1096,14 @@@ config AI
            by some high performance threaded applications. Disabling
            this option saves about 7k.
  
 +config EMBEDDED
 +      bool "Embedded system"
 +      select EXPERT
 +      help
 +        This option should be enabled if compiling the kernel for
 +        an embedded system so certain expert options are available
 +        for configuration.
 +
  config HAVE_PERF_EVENTS
        bool
        help
@@@ -1226,6 -1226,7 +1226,7 @@@ config SLA
          per cpu and per node queues.
  
  config SLUB
+       depends on BROKEN || NUMA || !DISCONTIGMEM
        bool "SLUB (Unqueued Allocator)"
        help
           SLUB is a slab allocator that minimizes cache line usage