Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/kernel/signal32.c
Simple merge

diff --cc drivers/mmc/core/core.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

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

diff --cc kernel/fork.c
Simple merge

diff --cc mm/vmscan.c
Simple merge

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

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

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