Merge commit 'v3.0-rc7' into android-3.0

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

diff --cc kernel/sched.c
Simple merge

diff --cc net/ipv4/af_inet.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv6/af_inet6.c
Simple merge

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