[PATCH] data: klog.json: remove the duplicated KlogEnergyPerfBiasSetToNormal item

[Keng-Yu Lin]

This patch merges the two duplicated KlogEnergyPerfBiasSetToNormal items
introduced by the following two patches.

    commit a1d8fd49e9c22a12a0bcf1a843631d3c4be882a8
    Author: Colin Ian King <colin.king at canonical.com>
    Date:   Fri Nov 2 07:15:11 2012 +0000

        data: klog.json: Add support for ACPI fan and ACPI processor throttling

    commit c3a9eb921aaa468ff7fbc426d4df0cf55a8ad2e1
    Author: IvanHu <ivan.hu at canonical.com>
    Date:   Wed Oct 24 19:44:26 2012 +0000

        klog: change the MSR_IA32_ENERGY_PERF_BIAS test from fauilure to info

Signed-off-by: Keng-Yu Lin <kengyu at canonical.com>
---
 data/klog.json |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/data/klog.json b/data/klog.json
index 1566cdb..ee02e04 100644
--- a/data/klog.json
+++ b/data/klog.json
@@ -1430,10 +1430,10 @@
   },
   {
    "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
+   "log_level": "LOG_LEVEL_INFO",
    "tag": "FWTS_TAG_BIOS",
    "pattern": "ENERGY_PERF_BIAS.*Set to 'normal'.* was 'performance'",
-   "advice": "The MSR_IA32_ENERGY_PERF_BIAS was initialized incorrectly and was defaulted to a high performance bias setting.  The kernel has detected this and changed it down to a 'normal' bias setting.  The BIOS vendor should be informed that the MSR is not defaulted to the normal bias setting.",
+   "advice": "This is not exactly a failure but a warning from the kernel. The MSR_IA32_ENERGY_PERF_BIAS was initialized and defaulted to a high performance bias setting. The kernel has detected this and changed it down to a 'normal' bias setting.",
    "label": "KlogEnergyPerfBiasSetToNormal"
   },
   {
@@ -1510,14 +1510,6 @@
   },
   {
    "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_INFO",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "ENERGY_PERF_BIAS.*Set to 'normal'.* was 'performance'",
-   "advice": "This is not exactly a failure but a warning from the kernel. The MSR_IA32_ENERGY_PERF_BIAS was initialized and defaulted to a high performance bias setting. The kernel has detected this and changed it down to a 'normal' bias setting."
-   "label": "KlogEnergyPerfBiasSetToNormal"
-  },
-  {
-   "compare_mode": "regex",
    "log_level": "LOG_LEVEL_CRITICAL",
    "tag": "FWTS_TAG_ACPI",
    "pattern": "pnp.*can't evaluate _CRS: 12311",
-- 
1.7.9.5