From 284041dc14f21cd343fed4297cd67ff540d22511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Thu, 6 Mar 2014 17:22:09 +0100
Subject: [PATCH] systemd: added cpupower.service conflict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolves: rhbz#1073392

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
---
 tuned.service | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tuned.service b/tuned.service
index e205730..d2d5d83 100644
--- a/tuned.service
+++ b/tuned.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Dynamic System Tuning Daemon
 After=syslog.target
+Conflicts=cpupower.service
 
 [Service]
 Type=dbus
-- 
1.8.5.3