Merge branches 'fixes' and 'misc' into for-linus

diff --combined arch/arm/mach-s3c/mach-jive.c
index 7d15b84,285e1f0..0d7d408
--- 1/arch/arm/mach-s3c/mach-jive.c
--- 2/arch/arm/mach-s3c/mach-jive.c
+++ b/arch/arm/mach-s3c/mach-jive.c
@@@ -236,17 -236,18 +236,18 @@@ static int __init jive_mtdset(char *opt
        unsigned long set;
  
        if (options == NULL || options[0] == '\0')
 -              return 0;
 +              return 1;
  
        if (kstrtoul(options, 10, &set)) {
                printk(KERN_ERR "failed to parse mtdset=%s\n", options);
 -              return 0;
 +              return 1;
        }
  
        switch (set) {
        case 1:
                nand->nr_partitions = ARRAY_SIZE(jive_imageB_nand_part);
                nand->partitions = jive_imageB_nand_part;
+               break;
        case 0:
                /* this is already setup in the nand info */
                break;
@@@ -255,7 -256,7 +256,7 @@@
                       "using default.", set);
        }
  
 -      return 0;
 +      return 1;
  }
  
  /* parse the mtdset= option given to the kernel command line */

diff --combined lib/Kconfig
index fa4b103,c80fde8..9b5a692
--- 1/lib/Kconfig
--- 2/lib/Kconfig
+++ b/lib/Kconfig
@@@ -45,6 -45,7 +45,6 @@@ config BITREVERS
  config HAVE_ARCH_BITREVERSE
        bool
        default n
 -      depends on BITREVERSE
        help
          This option enables the use of hardware bit-reversal instructions on
          architectures which support such operations.
@@@ -64,9 -65,6 +64,6 @@@ config GENERIC_STRNLEN_USE
  config GENERIC_NET_UTILS
        bool
  
- config GENERIC_FIND_FIRST_BIT
-       bool
- 
  source "lib/math/Kconfig"
  
  config NO_GENERIC_PCI_IOPORT_MAP
@@@ -121,6 -119,8 +118,8 @@@ config INDIRECT_IOMEM_FALLBAC
          mmio accesses when the IO memory address is not a registered
          emulated region.
  
+ source "lib/crypto/Kconfig"
+ 
  config CRC_CCITT
        tristate "CRC-CCITT functions"
        help
@@@ -670,6 -670,10 +669,10 @@@ config STACKDEPO
        bool
        select STACKTRACE
  
+ config STACKDEPOT_ALWAYS_INIT
+       bool
+       select STACKDEPOT
+ 
  config STACK_HASH_ORDER
        int "stack depot hash size (12 => 4KB, 20 => 1024KB)"
        range 12 20
@@@ -679,6 -683,11 +682,11 @@@
         Select the hash size as a power of 2 for the stackdepot hash table.
         Choose a lower value to reduce the memory impact.
  
+ config REF_TRACKER
+       bool
+       depends on STACKTRACE_SUPPORT
+       select STACKDEPOT
+ 
  config SBITMAP
        bool