Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

diff --cc arch/arm/kernel/process.c
Simple merge

diff --cc drivers/usb/gadget/composite.c
Simple merge

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

diff --cc kernel/futex.c
Simple merge

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