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

diff --cc arch/arm/common/Makefile
Simple merge

diff --cc drivers/hid/hid-input.c
Simple merge

diff --cc drivers/of/fdt.c
Simple merge

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

diff --cc security/selinux/hooks.c
Simple merge