Merge branch 'akpm'

diff --cc lib/Makefile
index a4be79bc706a0537a742f4732d452c6e11abb703,fbf4b069e68d3f9822d18c694b11628d2191eefa..4ac9e49b2c2a9372bd3e32ed6106f767a3219262
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -14,6 -14,7 +14,7 @@@ lib-y := ctype.o string.o vsprintf.o cm
         proportions.o prio_heap.o ratelimit.o show_mem.o \
         is_single_threaded.o plist.o decompress.o find_next_bit.o
  
 -lib-$(CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS) += usercopy.o
++obj-$(CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS) += usercopy.o
  lib-$(CONFIG_MMU) += ioremap.o
  lib-$(CONFIG_SMP) += cpumask.o