From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 27 Jul 2012 22:06:32 +0000 (+0100)
Subject: Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linus
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=91b006def384d8f07f9f324ab211fefe2b085c90;p=openwrt%2Fstaging%2Fblogic.git

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

91b006def384d8f07f9f324ab211fefe2b085c90
diff --cc arch/arm/lib/Makefile
index 992769ae2599,992769ae2599,b621114644fd,992769ae2599,d5060dab6e52,992769ae2599..2473fd1fd51c
--- a/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             \