Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Mon, 23 Dec 2013 02:54:59 +0000 (10:54 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 23 Dec 2013 02:54:59 +0000 (10:54 +0800)
commitabc5c8153c473f352bbc6eccfb016564a1b58b7e
tree3d5b999e02a8136998d72eb60df923ed81793a69
parent188c91c2f4c54d8265ed947886ec1bbcf8f24e99
parent3c6556b1a9c2f9c91aacbc57bac938691fedda81
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
arch/arm/kernel/process.c
drivers/usb/gadget/composite.c
fs/nfs/nfs4proc.c
kernel/futex.c
security/selinux/hooks.c