Merge tag 'v3.10.54' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Sat, 6 Sep 2014 10:08:02 +0000 (11:08 +0100)
committerMark Brown <broonie@kernel.org>
Sat, 6 Sep 2014 10:08:02 +0000 (11:08 +0100)
This is the 3.10.54 stable release

1  2 
arch/x86/Kconfig

diff --combined arch/x86/Kconfig
index 78592b17a259bdb1eea4bdb3cd81093dce08df8a,4e5b80d883c8335f1d7a906101c78e8d098782d6..3115eae96ad8a2963d2d78fbf18a8189ac8dde28
@@@ -208,12 -208,6 +208,12 @@@ config ARCH_HIBERNATION_POSSIBL
  config ARCH_SUSPEND_POSSIBLE
        def_bool y
  
 +config ARCH_WANT_HUGE_PMD_SHARE
 +      def_bool y
 +
 +config ARCH_WANT_GENERAL_HUGETLB
 +      def_bool y
 +
  config ZONE_DMA32
        bool
        default X86_64
@@@ -1584,6 -1578,7 +1584,7 @@@ config EF
  config EFI_STUB
         bool "EFI stub support"
         depends on EFI
+        select RELOCATABLE
         ---help---
            This kernel feature allows a bzImage to be loaded directly
          by EFI firmware without the use of a bootloader.