Merge branch 'misc' into for-next

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
index 9f617417c0a39f266630fc11506c829cf5f6b723,4c9f402295dd3d9b11548ab47d26853761df62f1..950d415de1ae349fc19f069f4bf24ac2cff809fa
--- 1/arch/mips/Kconfig
--- 2/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -13,7 -13,10 +13,8 @@@ config MIP
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select RTC_LIB if !MACH_LOONGSON
+       select GENERIC_ATOMIC64 if !64BIT
  
 -mainmenu "Linux/MIPS Kernel Configuration"
 -
  menu "Machine selection"
  
  config ZONE_DMA

diff --cc arch/mn10300/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge