Merge commit 'v3.0.58' into android-3.0

Change-Id: I05959ed26f71cf9197df59291e8e13f254b2115c

diff --cc arch/arm/vfp/vfpmodule.c
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/futex.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc net/bluetooth/hci_core.c
Simple merge

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

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

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

diff --cc net/wireless/core.c
Simple merge

diff --cc net/wireless/reg.c
Simple merge