Merge branch 'master' into for-linus
Pekka Enberg [Sun, 24 Oct 2010 16:57:05 +0000 (19:57 +0300)]
Conflicts:
include/linux/percpu.h
mm/percpu.c

1  2 
lib/Kconfig.debug

Simple merge