From 5f27adc0d3e466cb2012002c6bfae342edd4704b Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Wed, 11 Sep 2013 08:16:46 -0400
Subject: [PATCH] Linux v3.11-9031-ga22a0fd

---
 config-arm64   | 1 +
 config-armv7   | 1 +
 config-generic | 1 +
 kernel.spec    | 5 ++++-
 sources        | 2 +-
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config-arm64 b/config-arm64
index 78dd575d1..6506b2bf1 100644
--- a/config-arm64
+++ b/config-arm64
@@ -84,3 +84,4 @@ CONFIG_VM_EVENT_COUNTERS=y
 #  dma issues in headers
 # CONFIG_PARPORT_PC is not set
 # CONFIG_VGA_CONSOLE is not set
+CONFIG_POWER_RESET_XGENE=y
diff --git a/config-armv7 b/config-armv7
index 271c34efb..34b9c939f 100644
--- a/config-armv7
+++ b/config-armv7
@@ -137,6 +137,7 @@ CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_MADC=m
 CONFIG_TWL4030_POWER=y
 CONFIG_TWL4030_WATCHDOG=m
+CONFIG_BATTERY_TWL4030_MADC=m
 CONFIG_OMAP_USB2=m
 CONFIG_OMAP_USB3=m
 CONFIG_TWL4030_USB=m
diff --git a/config-generic b/config-generic
index fd6a41248..277e9f663 100644
--- a/config-generic
+++ b/config-generic
@@ -4521,6 +4521,7 @@ CONFIG_APM_POWER=m
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_PCF50633 is not set
 # CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
 CONFIG_POWER_RESET=y
 
 # CONFIG_PDA_POWER is not set
diff --git a/kernel.spec b/kernel.spec
index 8bf554b2d..4fde17b39 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -95,7 +95,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 19
+%define gitrev 20
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -2295,6 +2295,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Wed Sep 11 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git20.1
+- Linux v3.11-9031-ga22a0fd
+
 * Tue Sep 10 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git19.1
 - Linux v3.11-8935-g31f7c3a
 
diff --git a/sources b/sources
index 5044e3e68..7456cc381 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 fea363551ff45fbe4cb88497b863b261  linux-3.11.tar.xz
-b2dbae9c2716b3d304f380576c022d45  patch-3.11-git19.xz
+cc8ed4c576f297291c5667d6db5b0350  patch-3.11-git20.xz