Merge branch 'mvebu/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Merge the mvebu/drivers branch of the arm-soc tree which contains
just a single patch bfa1ce5f38938cc9e6c7f2d1011f88eba2b9e2b2 ("bus:
mvebu-mbus: add mv_mbus_dram_info_nooverlap()") that happens to be
a prerequisite of the new marvell/cesa crypto driver.

1 files changed, 2 insertions, 7 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index 42c925e9caea..34e332b8d326 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -18,9 +18,8 @@ config HAVE_ARCH_BITREVERSE
         default n
         depends on BITREVERSE
         help
-          This option provides an config for the architecture which have instruction
-          can do bitreverse operation, we use the hardware instruction if the architecture
-          have this capability.
+          This option enables the use of hardware bit-reversal instructions on
+          architectures which support such operations.
 
 config RATIONAL
         bool
@@ -403,10 +402,6 @@ config CPUMASK_OFFSTACK
           them on the stack.  This is a bit more expensive, but avoids
           stack overflow.
 
-config DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
-       bool "Disable obsolete cpumask functions" if DEBUG_PER_CPU_MAPS
-       depends on BROKEN
-
 config CPU_RMAP
         bool
         depends on SMP