Merge branch android-common-3.10

diff --cc fs/ext4/super.c
Simple merge

diff --cc kernel/power/suspend.c
Simple merge

diff --cc net/caif/caif_socket.c
Simple merge

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

diff --cc net/unix/af_unix.c
Simple merge

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