Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 27 Jul 2012 22:06:32 +0000 (23:06 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 27 Jul 2012 22:06:32 +0000 (23:06 +0100)
1  2  3  4  5  6 
arch/arm/Kconfig
arch/arm/kernel/arch_timer.c
arch/arm/kernel/armksyms.c
arch/arm/kernel/perf_event.c
arch/arm/kernel/traps.c
arch/arm/lib/Makefile
arch/arm/mm/dma-mapping.c
arch/arm/mm/init.c
arch/arm/mm/mmu.c
drivers/tty/serial/amba-pl011.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@@@@@ -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             \
Simple merge
Simple merge
Simple merge
Simple merge