Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Tue, 15 Apr 2014 01:59:04 +0000 (09:59 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 15 Apr 2014 01:59:04 +0000 (09:59 +0800)
commitdca382e80b49447925d82eff22c716dadcbee09f
tree8edf88bc274f5a1ff1c4c2f1adeb1fbf37281a77
parentdfbd3a7884d7d2f94eb2e5c56cbc421369376178
parentdc65fae3f730b6a1888f5559d68e59111f013c4f
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/cpufreq/cpufreq.c
drivers/cpufreq/cpufreq_governor.c
include/linux/cpufreq.h
init/Kconfig
kernel/futex.c
net/ipv4/tcp_output.c
net/ipv6/icmp.c
net/unix/af_unix.c
security/selinux/hooks.c