Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 19 Jun 2014 10:42:18 +0000 (11:42 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 19 Jun 2014 10:42:18 +0000 (11:42 +0100)
commit40329a6815e0740c68fcdb596ea35c2884868426
tree20f7187f0ef31c2cb4be3f00503d55973486941f
parent8bf8e46c3064ccab7d067f2285e326721f0ffe85
parent18d0981fbb545653c6d8eff8206b629b87f50610
Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

Conflicts:
net/wireless/nl80211.c
arch/arm64/boot/dts/Makefile
drivers/cpufreq/cpufreq_interactive.c
drivers/cpufreq/cpufreq_stats.c
net/netfilter/xt_qtaguid.c
net/wireless/nl80211.c