Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Mon, 7 Jul 2014 02:48:56 +0000 (10:48 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 7 Jul 2014 02:48:56 +0000 (10:48 +0800)
commitc30d344580ad053502cf5d81288dcd690791d162
treebe9c4093d65f386a07363d263418e87cb18550c7
parent471dd6b43f72f8ee00d3d1a1281d5aed9d4991ca
parent49bcf50125c661f45a030edd1a241917f1c7a821
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
fs/nfs/inode.c
kernel/fork.c
kernel/trace/trace.c