summaryrefslogtreecommitdiffstats
path: root/mobile
diff options
context:
space:
mode:
Diffstat (limited to 'mobile')
-rw-r--r--mobile/cpufreqd/CONFLICTS1
-rw-r--r--mobile/cpufreqd/HISTORY3
2 files changed, 4 insertions, 0 deletions
diff --git a/mobile/cpufreqd/CONFLICTS b/mobile/cpufreqd/CONFLICTS
new file mode 100644
index 0000000000..200064ff06
--- /dev/null
+++ b/mobile/cpufreqd/CONFLICTS
@@ -0,0 +1 @@
+conflicts linux-cpupower
diff --git a/mobile/cpufreqd/HISTORY b/mobile/cpufreqd/HISTORY
index 481c49673a..b7556735df 100644
--- a/mobile/cpufreqd/HISTORY
+++ b/mobile/cpufreqd/HISTORY
@@ -1,3 +1,6 @@
+2016-09-08 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Conflicts with new linux-cpupower (replacement).
+
2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)