Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Fri, 10 Oct 2014 11:59:43 +0000 (12:59 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 10 Oct 2014 11:59:43 +0000 (12:59 +0100)
commit8407e2ffb76d56c77b8eb8faa44b06b1b987ac3a
tree2ad6bff3cf58c65bc33387dbf1ee50d0bacfa38d
parent4a105b2f855d956b419c513e1f3212a9ac1d27f5
parentf8ba86b7fbe99740c82a7442a0c94e7584dd02bf
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
net/wireless/nl80211.c
drivers/cpufreq/cpufreq_governor.c
drivers/cpufreq/cpufreq_governor.h
drivers/cpufreq/cpufreq_stats.c
init/Kconfig
kernel/fork.c
net/wireless/nl80211.c