Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Tue, 29 Jul 2014 05:55:15 +0000 (13:55 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 29 Jul 2014 05:55:15 +0000 (13:55 +0800)
commit7c18f677c1a7a94efc845ecedde2f1d1463d4359
treee6841fbec6073f2c068fa6aec1f477964d34e198
parent1df5f2728eb1ba0f7b783c00afe7575902996d39
parent77917ecac9c37f9f02e7954b617df8f824894778
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
arch/arm/Kconfig
arch/arm64/Kconfig
kernel/power/process.c
kernel/time/alarmtimer.c
kernel/trace/trace.c
mm/shmem.c
net/ipv4/icmp.c
net/ipv4/route.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv4/tcp_output.c