From 6cc3fe9c50dc52f19cdb990f0013ade5bcba35e1 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Nov 03 2011 13:30:13 +0000
Subject: Linux 3.1-git5 (upstream 43672a0784707)


---

diff --git a/config-arm-omap-generic b/config-arm-omap-generic
index d836a90..504497e 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap-generic
@@ -94,6 +94,7 @@ CONFIG_MACH_OMAP_3630SDP=y
 CONFIG_MACH_OMAP_4430SDP=y
 CONFIG_MACH_OMAP4_PANDA=y
 CONFIG_MACH_TI8168EVM=y
+CONFIG_MACH_OMAP_GENERIC=y
 CONFIG_OMAP3_EMU=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
 # System MMU
@@ -630,6 +631,7 @@ CONFIG_REGULATOR_TWL4030=y
 # CONFIG_REGULATOR_ISL6271A is not set
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_GPIO is not set
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_RC_CORE=y
 CONFIG_LIRC=y
diff --git a/config-arm-tegra b/config-arm-tegra
index 0642df0..0f9d0f0 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -5,6 +5,7 @@ CONFIG_MACH_PAZ00=y
 CONFIG_MACH_TRIMSLICE=y
 CONFIG_MACH_WARIO=y
 CONFIG_MACH_TEGRA_DT=y
+CONFIG_MACH_VENTANA=y
 CONFIG_TEGRA_DEBUG_UARTD=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
diff --git a/config-generic b/config-generic
index e56124b..6ae1e84 100644
--- a/config-generic
+++ b/config-generic
@@ -68,6 +68,7 @@ CONFIG_SLUB=y
 
 CONFIG_MISC_DEVICES=y
 # CONFIG_AD525X_DPOT is not set
+# CONFIG_ATMEL_PWM is not set
 CONFIG_IWMC3200TOP=m
 # CONFIG_IWMC3200TOP_DEBUG is not set
 CONFIG_IWMC3200TOP_DEBUGFS=y
@@ -434,6 +435,7 @@ CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VMXNET3=m
 CONFIG_HW_RANDOM_VIRTIO=m
@@ -691,6 +693,9 @@ CONFIG_DM_DEBUG=y
 CONFIG_DM_MIRROR=y
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_THIN_PROVISIONING=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+# CONFIG_DM_DEBUG_SPACE_MAPS is not set
 CONFIG_DM_UEVENT=y
 CONFIG_DM_ZERO=y
 CONFIG_DM_LOG_USERSPACE=m
@@ -4546,6 +4551,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS_CLIENT_PARPORT=m
 CONFIG_PPS_GENERATOR_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
 CONFIG_NTP_PPS=y
 
 CONFIG_PTP_1588_CLOCK=m
@@ -4591,6 +4597,8 @@ CONFIG_BLK_DEV_DRBD=m
 # CONFIG_KEYBOARD_GPIO is not set
 # CONFIG_KEYBOARD_GPIO_POLLED is not set
 # CONFIG_MOUSE_GPIO is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_DESIGNWARE_PCI is not set
 # CONFIG_I2C_GPIO is not set
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_W1_MASTER_GPIO is not set
diff --git a/config-x86-generic b/config-x86-generic
index 8885773..99af569 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -164,6 +164,7 @@ CONFIG_EDAC_R82600=m
 CONFIG_EDAC_X38=m
 CONFIG_EDAC_MCE_INJ=m
 CONFIG_EDAC_DECODE_MCE=m
+CONFIG_EDAC_SBRIDGE=m
 
 CONFIG_SCHED_MC=y
 
diff --git a/kernel.spec b/kernel.spec
index ff5734e..769b76c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 1
+%global baserelease 0
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -84,7 +84,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 4
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -2029,6 +2029,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu Nov 03 2011 Josh Boyer <jwboyer@redhat.com>
+- Linux 3.1-git5
+
 * Tue Nov 01 2011 Josh Boyer <jwboyer@redhat.com>
 - Linux 3.1-git4
 
diff --git a/sources b/sources
index 42103e6..9944ac6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 8d43453f8159b2332ad410b19d86a931  linux-3.1.tar.bz2
-f6754489c6fb6de511c3fcd2b2fa4474  patch-3.1-git3.bz2
-349569748e059f2b64adab5eb7cf42e6  patch-3.1-git4.bz2
+b98c65cd86830fbc8f1e826c1a7b57fa  patch-3.1-git5.bz2