From: Aaro Koskinen Date: Sun, 21 Sep 2014 12:38:43 +0000 (+0300) Subject: MIPS: loongson2_cpufreq: Fix CPU clock rate setting mismerge X-Git-Tag: fixes-against-v3.18-rc2~6^2~14 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa08ed55442ac6f9810c055e1474be34e785e556;p=pandora-kernel.git MIPS: loongson2_cpufreq: Fix CPU clock rate setting mismerge During 3.16 merge window, parts of the commit 8e8acb32960f (MIPS/loongson2_cpufreq: Fix CPU clock rate setting) seem to have been deleted probably due to a mismerge, and as a result cpufreq is broken again on Loongson2 boards in 3.16 and newer kernels. Fix by repeating the fix. Signed-off-by: Aaro Koskinen Cc: stable@vger.kernel.org # 3.16 Cc: Rafael J. Wysocki Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/7835/ Signed-off-by: Ralf Baechle --- Reading git-diff-tree failed