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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/include/asm/unistd.h
index 7cba573c2cc9541a23ff2e0675a701117f7cf269,7cba573c2cc9541a23ff2e0675a701117f7cf269,8f63daf3efa39c0a7bea3b490e21fcf6aecef6ab..7b84657fba3577ea3d29ecf1b93e3267feecbb59
--- 1/arch/arm/include/asm/unistd.h
--- 2/arch/arm/include/asm/unistd.h
--- 3/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@@@ -19,15 -19,15 -19,8 +19,8 @@@@
    * This may need to be greater than __NR_last_syscall+1 in order to
    * account for the padding in the syscall table
    */
  -#define __NR_syscalls  (388)
  +#define __NR_syscalls  (392)
   
-- /*
--  * *NOTE*: This is a ghost syscall private to the kernel.  Only the
--  * __kuser_cmpxchg code in entry-armv.S should be aware of its
--  * existence.  Don't ever use this from user code.
--  */
-- #define __ARM_NR_cmpxchg             (__ARM_NR_BASE+0x00fff0)
-- 
   #define __ARCH_WANT_STAT64
   #define __ARCH_WANT_SYS_GETHOSTNAME
   #define __ARCH_WANT_SYS_PAUSE