From: Mark Brown Date: Thu, 14 Nov 2013 15:43:52 +0000 (+0000) Subject: Merge remote-tracking branch 'lsk/v3.10/topic/android-fixes' into linux-linaro-lsk... X-Git-Tag: firefly_0821_release~3680^2~198 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f3401c581ccf80d60107699c012da3f820f88b9e;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branch 'lsk/v3.10/topic/android-fixes' into linux-linaro-lsk-android The cpufreq_interactive changes have been merged upstream and the local version dropped. Conflicts: drivers/cpufreq/cpufreq_interactive.c --- f3401c581ccf80d60107699c012da3f820f88b9e