Merge commit 'v3.0.1' into android-3.0

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc kernel/futex.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge