Merge branches 'arch-timers', 'atags', 'cache-l2x0', 'clkdev', 'fixes', 'integrator...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/include/asm/thread_info.h
Simple merge

diff --cc arch/arm/include/asm/unistd.h
index 0cab47d4a83ff97a23c7a9d2975cfb855a687e3e,0cab47d4a83ff97a23c7a9d2975cfb855a687e3e,0cab47d4a83ff97a23c7a9d2975cfb855a687e3e,2fde5fd1accedda5a00accac967e1985be9c7f08,0cab47d4a83ff97a23c7a9d2975cfb855a687e3e,0cab47d4a83ff97a23c7a9d2975cfb855a687e3e,0cab47d4a83ff97a23c7a9d2975cfb855a687e3e,a566ec20d486bd9ee44c69f705ba5077e4df4254..d9ff5cc3a5060177be581772cf22ead601ad4f65
--- 1/arch/arm/include/asm/unistd.h
--- 2/arch/arm/include/asm/unistd.h
--- 3/arch/arm/include/asm/unistd.h
--- 4/arch/arm/include/asm/unistd.h
--- 5/arch/arm/include/asm/unistd.h
--- 6/arch/arm/include/asm/unistd.h
--- 7/arch/arm/include/asm/unistd.h
--- 8/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@@@@@@@@ -404,7 -404,7 -404,7 -404,8 -404,7 -404,7 -404,7 -404,15 +404,16 @@@@@@@@@
        #define __NR_setns                      (__NR_SYSCALL_BASE+375)
        #define __NR_process_vm_readv           (__NR_SYSCALL_BASE+376)
        #define __NR_process_vm_writev          (__NR_SYSCALL_BASE+377)
+++ ++++                                        /* 378 for kcmp */
+++ +++ 
+++++++ /*
+++++++  * This may need to be greater than __NR_last_syscall+1 in order to
+++++++  * account for the padding in the syscall table
+++++++  */
+++++++ #ifdef __KERNEL__
+++++++ #define __NR_syscalls  (380)
+++++++ #endif /* __KERNEL__ */
   +    
        /*
         * The following SWIs are ARM private.
         */

diff --cc arch/arm/kernel/sched_clock.c
Simple merge