Merge remote-tracking branch 'trivial/for-next'

Conflicts:
	arch/powerpc/platforms/40x/Kconfig
	net/mac80211/work.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/40x/Kconfig
index baae85584b1ce48275dca889ede7683a4b83cc37,bd69cf8d82226e35bc48e87e5c0e34db51c45bd6..a392d12dd21f89a935ff93499c21d71891d868b0
--- 1/arch/powerpc/platforms/40x/Kconfig
--- 2/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@@ -182,28 -148,3 +158,12 @@@ config IBM405_ERR7
  # All 40x-based cores, up until the 405GPR and 405EP have this errata.
  config IBM405_ERR51
        bool
- #config BIOS_FIXUP
- #     bool
- #     depends on BUBINGA || EP405 || SYCAMORE || WALNUT
- #     default y
- 
- #config PPC4xx_DMA
- #     bool "PPC4xx DMA controller support"
- #     depends on 4xx
- 
- #config PPC4xx_EDMA
- #     bool
- #     depends on !STB03xxx && PPC4xx_DMA
- #     default y
- #
- 
 +
- 
 +config APM8018X
 +      bool "APM8018X"
 +      depends on 40x
 +      default n
 +      select PPC40x_SIMPLE
 +      help
 +        This option enables support for the AppliedMicro APM8018X evaluation
 +        board.

diff --cc arch/powerpc/platforms/44x/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc crypto/Kconfig
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/mtd/nand/Kconfig
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4vf/sge.c
Simple merge

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/tty/serial/Kconfig
Simple merge

diff --cc drivers/usb/gadget/Kconfig
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/namespace.c
Simple merge

diff --cc fs/nfsd/nfs4state.c
Simple merge

diff --cc fs/ocfs2/file.c
Simple merge

diff --cc include/drm/drmP.h
Simple merge

diff --cc include/linux/security.h
Simple merge

diff --cc include/net/mac80211.h
Simple merge

diff --cc kernel/irq/manage.c
Simple merge

diff --cc lib/Kconfig
index c084cdc385ad712fce9d06e339aa3ad0a6c2b379,d971366b8de20cb94bdf7746b5d1f97729857965..f3edf1471573589d2ad8f700f6a3a20e87a861ce
--- 1/lib/Kconfig
--- 2/lib/Kconfig
+++ b/lib/Kconfig
@@@ -273,35 -270,9 +273,34 @@@ config AVERAG
          If unsure, say N.
  
  config CORDIC
-       tristate "Cordic function"
+       tristate "CORDIC algorithm"
        help
-         The option provides arithmetic function using cordic algorithm
-         so its calculations are in fixed point. Modules can select this
-         when they require this function. Module will be called cordic.
+         This option provides an implementation of the CORDIC algorithm;
+         calculations are in fixed point. Module will be called cordic.
  
 +config MPILIB
 +      tristate "Multiprecision maths library"
 +      help
 +        Multiprecision maths library from GnuPG.
 +        It is used to implement RSA digital signature verification,
 +        which is used by IMA/EVM digital signature extension.
 +
 +config MPILIB_EXTRA
 +      bool "Multiprecision maths library - additional sources"
 +      depends on MPILIB
 +      help
 +        Multiprecision maths library from GnuPG.
 +        It is used to implement RSA digital signature verification,
 +        which is used by IMA/EVM digital signature extension.
 +        This code in unnecessary for RSA digital signature verification,
 +        and can be compiled if needed.
 +
 +config DIGSIG
 +      tristate "In-kernel signature checker"
 +      depends on KEYS
 +      select MPILIB
 +      help
 +        Digital signature verification. Currently only RSA is supported.
 +        Implementation is done using GnuPG MPI library
 +
  endmenu

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/ipv4/Kconfig
Simple merge