Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

diff --cc Documentation/networking/ip-sysctl.txt
Simple merge

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

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

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

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

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