Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linus

diff --cc arch/arm/Kconfig
Simple merge

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

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

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

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

diff --cc arch/arm/lib/Makefile
index 992769a,992769a,b621114,992769a,d5060da,992769a..2473fd1
--- 1/arch/arm/lib/Makefile
--- 2/arch/arm/lib/Makefile
--- 3/arch/arm/lib/Makefile
--- 4/arch/arm/lib/Makefile
--- 5/arch/arm/lib/Makefile
--- 6/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@@@@@@ -6,9 -6,9 -6,9 -6,9 -6,8 -6,9 +6,8 @@@@@@@
      
      lib-y             := backtrace.o changebit.o csumipv6.o csumpartial.o   \
                   csumpartialcopy.o csumpartialcopyuser.o clearbit.o \
-- ---             delay.o findbit.o memchr.o memcpy.o                \
++ +++             delay.o delay-loop.o findbit.o memchr.o memcpy.o   \
                   memmove.o memset.o memzero.o setbit.o              \
---- -             strncpy_from_user.o strnlen_user.o                 \
                   strchr.o strrchr.o                                 \
                   testchangebit.o testclearbit.o testsetbit.o        \
                   ashldi3.o ashrdi3.o lshrdi3.o muldi3.o             \

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/arm/mm/init.c
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge

diff --cc drivers/tty/serial/amba-pl011.c
Simple merge