Linux v3.8-6071-g8b5628a

- Enable the rtl8192e driver (rhbz 913753)

13 files changed, 111 insertions, 195 deletions

diff --git a/arm-allnoconfig-error-__LINUX_ARM_ARCH__-undeclared.patch b/arm-allnoconfig-error-__LINUX_ARM_ARCH__-undeclared.patch
deleted file mode 100644
index fd92c1664..000000000
--- a/arm-allnoconfig-error-__LINUX_ARM_ARCH__-undeclared.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From patchwork Sun Jul 22 10:01:43 2012
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: arm-allnoconfig error: '__LINUX_ARM_ARCH__' undeclared
-Date: Sun, 22 Jul 2012 10:01:43 -0000
-From: Arnd Bergmann <arnd@arndb.de>
-X-Patchwork-Id: 1224201
-Message-Id: <201207221001.43528.arnd@arndb.de>
-To: Fengguang Wu <fengguang.wu@intel.com>
-Cc: Russell King <linux@arm.linux.org.uk>,
- LKML <linux-kernel@vger.kernel.org>, linux-arm-kernel@lists.infradead.org
-
-On Sunday 22 July 2012, Fengguang Wu wrote:
-> Kernel build failed on arm-allnoconfig:
-> 
-> include/linux/math64.h:55:15: error: '__LINUX_ARM_ARCH__' undeclared (first use in this function)
-> arch/arm/include/asm/glue-cache.h:129:2: error: #error Unknown cache maintenance model
-> arch/arm/include/asm/glue-df.h:99:2: error: #error Unknown data abort handler type
-> arch/arm/include/asm/glue-pf.h:54:2: error: #error Unknown prefetch abort handler type
-> 
-> Do you think this allnoconfig test meaningful at all?
-
-The allno/mod/yesconfig tests on ARM are somewhat limited in their
-usefulness at the moment because they always pick the same platform
-type (versatile) and don't really cover the cases that most people
-are interested in.
-
-The particular problem with allnoconfig is that the logic to determine
-the architecture level depends on at least one platform being selected,
-and there are also problems with nommu kernels that tend to not work
-if certain other options are not set correctly. 
-
-We can make the nommu case go away if we make hide the option for
-non-expert configurations including allnoconfig. I suggested adding
-some logic to all the subarch Kconfig files that forces at least
-one of the boards to be enabled like the patch below, but a number
-of people didn't like it.
-
-For reference, here is what I would use in order to get 'make
-allnoconfig' to work on ARM. My impression is at the moment that
-we should make a more serious attempt at fixing all the possible
-configurations when we get to 'multiplatform' configurations,
-because that will be more interesting than doing it just for
-the versatile platform.
-
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-
-
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index a306d6d..e43e743 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -236,7 +236,7 @@ source "kernel/Kconfig.freezer"
- menu "System Type"
- 
- config MMU
--	bool "MMU-based Paged Memory Management Support"
-+	bool "MMU-based Paged Memory Management Support" if EXPERT
- 	default y
- 	help
- 	  Select if you want MMU-based virtualised addressing space
-diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
-index c1f38f6..455f20a 100644
---- a/arch/arm/mach-versatile/Kconfig
-+++ b/arch/arm/mach-versatile/Kconfig
-@@ -25,4 +25,13 @@ config MACH_VERSATILE_DT
- 	  Include support for the ARM(R) Versatile/PB platform,
- 	  using the device tree for discovery
- 
-+config MACH_VERSATILE_AUTO
-+	def_bool y
-+	depends on !ARCH_VERSATILE_PB
-+	depends on !MACH_VERSATILE_AB
-+	select MACH_VERSATILE_DT
-+	help
-+	  We autoselect MACH_VERSATILE_DT if both PB and AB are
-+	  disabled, to ensure that at least one platform is enabled.
-+
- endmenu
diff --git a/config-arm-generic b/config-arm-generic
index d3e361376..310a40939 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -18,7 +18,7 @@ CONFIG_SMP=y
 CONFIG_NR_CPUS=4
 CONFIG_SMP_ON_UP=y
 
-CONFIG_ARM_ARCH_TIMER=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
 
 CONFIG_CMDLINE=""
 
@@ -398,6 +398,7 @@ CONFIG_EXTCON_GPIO=m
 # CONFIG_FB_MX3 is not set
 # CONFIG_MX3_IPU is not set
 # CONFIG_MX3_IPU_IRQS is not set
+# CONFIG_SND_ATMEL_SOC is not set
 
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_CS89x0 is not set
diff --git a/config-arm-kirkwood b/config-arm-kirkwood
index e6a80f5c5..2112723f3 100644
--- a/config-arm-kirkwood
+++ b/config-arm-kirkwood
@@ -73,3 +73,4 @@ CONFIG_PINCTRL_KIRKWOOD=y
 
 CONFIG_FB_XGI=m
 CONFIG_POWER_RESET_QNAP=y
+CONFIG_CPU_IDLE_KIRKWOOD=y
diff --git a/config-arm-omap b/config-arm-omap
index 3038458bf..7a9c73113 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -1,6 +1,11 @@
 CONFIG_ARCH_OMAP=y
 CONFIG_ARCH_OMAP_OTG=y
 # CONFIG_ARCH_OMAP1 is not set
+# CONFIG_ARCH_MULTI_V4 is not set
+# CONFIG_ARCH_MULTI_V4T is not set
+# CONFIG_ARCH_MULTI_V6 is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_WM8505 is not set
 CONFIG_ARCH_OMAP2PLUS=y
 
 #
@@ -217,6 +222,8 @@ CONFIG_VIDEO_VIVI=m
 CONFIG_DRM=m
 CONFIG_DRM_OMAP=m
 CONFIG_DRM_OMAP_NUM_CRTCS=2
+# CONFIG_DRM_EXYNOS is not set
+# CONFIG_DRM_IMX is not set
 # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
 # CONFIG_FB_OMAP_LCD_VGA is not set
 CONFIG_OMAP2_VRAM=y
diff --git a/config-arm-tegra b/config-arm-tegra
index ed9f63687..ede85c03e 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -2,6 +2,7 @@ CONFIG_ARCH_TEGRA=y
 
 CONFIG_ARCH_TEGRA_2x_SOC=y
 # CONFIG_ARCH_TEGRA_3x_SOC is not set
+# CONFIG_ARCH_TEGRA_114_SOC is not set
 # CONFIG_ARM_LPAE is not set
 
 CONFIG_VFP=y
@@ -71,6 +72,7 @@ CONFIG_SND_SOC_TEGRA=m
 CONFIG_SND_SOC_TEGRA_ALC5632=m
 CONFIG_SND_SOC_TEGRA_WM8753=m
 CONFIG_SND_SOC_TEGRA_WM8903=m
+CONFIG_SND_SOC_TEGRA_WM9712=m
 CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
 CONFIG_SND_SOC_TEGRA30_AHUB=m
 CONFIG_SND_SOC_TEGRA30_I2S=m
@@ -102,6 +104,7 @@ CONFIG_LEDS_RENESAS_TPU=y
 
 CONFIG_OF=y
 CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SERIAL_TEGRA=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
diff --git a/config-armv7 b/config-armv7
index c65032db7..09aa3ce41 100644
--- a/config-armv7
+++ b/config-armv7
@@ -10,11 +10,14 @@ CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_MVEBU=y
 # CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_OMAP2PLUS is not set
 CONFIG_ARCH_PICOXCELL=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_VEXPRESS_CA9X4=y
 CONFIG_ARCH_VEXPRESS_DT=y
+CONFIG_ARCH_VIRT=y
+# CONFIG_ARCH_WM8850 is not set
 # not enabling first round
 # CONFIG_ARCH_ZYNQ is not set
 
@@ -24,7 +27,7 @@ CONFIG_MACH_ARMADA_XP=y
 
 # generic ARM config options
 CONFIG_CMDLINE=""
-CONFIG_ARM_ARCH_TIMER=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_AEABI=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
@@ -323,6 +326,7 @@ CONFIG_SND_DESIGNWARE_I2S=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SOC_CACHE_LZO=y
 CONFIG_SND_SOC_ALL_CODECS=m
+# CONFIG_SND_ATMEL_SOC is not set
 
 # EDAC
 CONFIG_EDAC=y
@@ -343,6 +347,7 @@ CONFIG_MFD_MAX8907=m
 
 # RTC
 CONFIG_RTC_DRV_SNVS=m
+# CONFIG_RTC_DRV_MV is not set
 
 # Pin stuff
 CONFIG_PINMUX=y
diff --git a/config-generic b/config-generic
index 83b56a09e..39b95e091 100644
--- a/config-generic
+++ b/config-generic
@@ -188,6 +188,9 @@ CONFIG_FW_LOADER=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_EXTRA_FIRMWARE=""
 
+# Give this a try in rawhide for now
+# CONFIG_FW_LOADER_USER_HELPER is not set
+
 # CONFIG_CMA is not set
 
 # CONFIG_SPI is not set
@@ -2390,6 +2393,7 @@ CONFIG_SENSORS_MAX197=m
 # CONFIG_USB_SWITCH_FSA9480 is not set
 CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_ARC_NR_PORTS=1
+# CONFIG_SERIAL_RP2 is not set
 
 CONFIG_W1=m
 CONFIG_W1_CON=y
@@ -2521,6 +2525,10 @@ CONFIG_RTC_DRV_MSM6242=m
 CONFIG_RTC_DRV_RP5C01=m
 CONFIG_RTC_DRV_EM3027=m
 CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_ISL12022=m
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 
 CONFIG_R3964=m
 # CONFIG_APPLICOM is not set
@@ -3044,6 +3052,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_CODEC_HDMI=y
 CONFIG_SND_HDA_CODEC_CA0132=y
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
 CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
@@ -3448,6 +3457,7 @@ CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
 CONFIG_USB_SERIAL_QCAUX=m
 CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_XSENS_MT=m
 CONFIG_USB_SERIAL_DEBUG=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
@@ -3469,6 +3479,8 @@ CONFIG_USB_SEVSEG=m
 CONFIG_USB_ALI_M5632=y
 CONFIG_USB_APPLEDISPLAY=m
 # CONFIG_OMAP_USB2 is not set
+# CONFIG_OMAP_USB3 is not set
+# CONFIG_OMAP_CONTROL_USB is not set
 CONFIG_USB_RCAR_PHY=m
 CONFIG_USB_ATM=m
 CONFIG_USB_CXACRU=m
@@ -3489,6 +3501,7 @@ CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
 CONFIG_USB_LEGOTOWER=m
@@ -3539,9 +3552,6 @@ CONFIG_PCF50633_GPIO=m
 # CONFIG_AB3100_CORE is not set
 CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_ISL12022=m
 
 CONFIG_MFD_SUPPORT=y
 CONFIG_MFD_VX855=m
@@ -4415,6 +4425,7 @@ CONFIG_NET_DSA_MV88E6123_61_65=m
 # CONFIG_PHONET is not set
 
 # CONFIG_ICS932S401 is not set
+# CONFIG_ATMEL_SSC is not set
 
 # CONFIG_C2PORT is not set
 
@@ -4439,7 +4450,6 @@ CONFIG_UWB_WHCI=m
 CONFIG_UWB_I1480U=m
 
 CONFIG_STAGING=y
-# CONFIG_RTLLIB is not set
 # CONFIG_ANDROID is not set
 CONFIG_STAGING_MEDIA=y
 # CONFIG_DVB_AS102 is not set
@@ -4468,7 +4478,12 @@ CONFIG_USB_ATMEL=m
 # CONFIG_RAR_REGISTER is not set
 # CONFIG_VT6656 is not set
 # CONFIG_USB_SERIAL_QUATECH_USB2 is not set
-# CONFIG_RTL8192E is not set
+# Larry Finger maintains these (rhbz 913753)
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
 # CONFIG_INPUT_GPIO is not set
 # CONFIG_VIDEO_CX25821 is not set
 # CONFIG_R8187SE is not set
diff --git a/config-x86-generic b/config-x86-generic
index 4791cdc5a..bf884fb2e 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -424,12 +424,16 @@ CONFIG_DRM_GMA3600=y
 CONFIG_RCU_FANOUT_LEAF=16
 
 CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=y
 
 # Maybe enable in debug kernels?
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 
 # CONFIG_X86_INTEL_LPSS is not set
 
+CONFIG_VMWARE_VMCI=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+
 CONFIG_MPILIB=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
 CONFIG_PE_FILE_PARSER=y
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 54403ba68..76306b778 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -133,3 +133,5 @@ CONFIG_CHECKPOINT_RESTORE=y
 # Should be 32bit only, but lacks KConfig depends
 # CONFIG_XO15_EBOOK is not set
 
+CONFIG_NTB=m
+CONFIG_NTB_NETDEV=m
diff --git a/devel-pekey-secure-boot-20130221.patch b/devel-pekey-secure-boot-20130222.patch
index 7812b1262..19b76b9a3 100644
--- a/devel-pekey-secure-boot-20130221.patch
+++ b/devel-pekey-secure-boot-20130222.patch
@@ -1,4 +1,4 @@
-From 3f91d07a25811fa58a6e48db1e17519fbc77c97e Mon Sep 17 00:00:00 2001
+From 5505011f0dea1c6ea1845f26f717c902e7ceeca8 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 18 Jan 2013 13:53:35 +0000
 Subject: [PATCH 01/47] KEYS: Load *.x509 files into kernel keyring
@@ -81,7 +81,7 @@ index 246b4c6..0a60203 100644
 1.8.1.2
 
 
-From 2daa6c03f96a971ebc678b4ccd990f3305e2f2e5 Mon Sep 17 00:00:00 2001
+From 0dd4f2579d10371b51c29a97a152679f47799b7b Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 18:39:54 +0000
 Subject: [PATCH 02/47] KEYS: Separate the kernel signature checking keyring
@@ -138,10 +138,10 @@ index 0000000..8dabc39
 +
 +#endif /* _KEYS_SYSTEM_KEYRING_H */
 diff --git a/init/Kconfig b/init/Kconfig
-index 7000d96..755bb7a 100644
+index 335a1f6..235b340 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1596,6 +1596,18 @@ config BASE_SMALL
+@@ -1566,6 +1566,18 @@ config BASE_SMALL
  	default 0 if BASE_FULL
  	default 1 if !BASE_FULL
  
@@ -160,7 +160,7 @@ index 7000d96..755bb7a 100644
  menuconfig MODULES
  	bool "Enable loadable module support"
  	help
-@@ -1668,6 +1680,7 @@ config MODULE_SRCVERSION_ALL
+@@ -1638,6 +1650,7 @@ config MODULE_SRCVERSION_ALL
  config MODULE_SIG
  	bool "Module signature verification"
  	depends on MODULES
@@ -526,7 +526,7 @@ index 0000000..a3ca76f
 1.8.1.2
 
 
-From d23e4fbcebd332eb4cdf125f2d2bba03af548f12 Mon Sep 17 00:00:00 2001
+From 690abd8eab5d8a819f6176a5c2854eb9065e6b0e Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Thu, 17 Jan 2013 16:25:00 +0000
 Subject: [PATCH 03/47] KEYS: Add a 'trusted' flag and a 'trusted only' flag
@@ -655,7 +655,7 @@ index 6ece7f2..f18d7ff 100644
 1.8.1.2
 
 
-From 4dce22c0b12d9bb27838bede832cf2a0b440ac21 Mon Sep 17 00:00:00 2001
+From fad2afa83a374279fd87de99e2c6c095ff5805d7 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:32 +0000
 Subject: [PATCH 04/47] KEYS: Rename public key parameter name arrays
@@ -810,7 +810,7 @@ index 0034e36..0b6b870 100644
 1.8.1.2
 
 
-From a0786aba4bae98b31c9a7018fe1f8e139c5d99cb Mon Sep 17 00:00:00 2001
+From e4cc5a26c7234e392cb728192c5b170e34b66482 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:33 +0000
 Subject: [PATCH 05/47] KEYS: Move the algorithm pointer array from x509 to
@@ -892,7 +892,7 @@ index 619d570..46bde25 100644
 1.8.1.2
 
 
-From dd8d2d91c8ff87e224478fab299771c6bc52b2ac Mon Sep 17 00:00:00 2001
+From a8c43547bf756aa0f9298eb6b2434bec396fdc5f Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:33 +0000
 Subject: [PATCH 06/47] KEYS: Store public key algo ID in public_key struct
@@ -977,7 +977,7 @@ index 46bde25..05778df 100644
 1.8.1.2
 
 
-From 19f078c7a00e385c4d9155aabe9f652561781aa7 Mon Sep 17 00:00:00 2001
+From 1734b7a677e734f8cc5a48f7d603a8459c6f07b3 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:34 +0000
 Subject: [PATCH 07/47] KEYS: Split public_key_verify_signature() and make
@@ -1093,7 +1093,7 @@ index fac574c..8cb2f70 100644
 1.8.1.2
 
 
-From f9075898d9df51ed080d5640c92fa9b696ed3aff Mon Sep 17 00:00:00 2001
+From e670c6092566a8ae4cc84f69de731ece54b8e6fe Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:35 +0000
 Subject: [PATCH 08/47] KEYS: Store public key algo ID in public_key_signature
@@ -1126,7 +1126,7 @@ index 05778df..b34fda4 100644
 1.8.1.2
 
 
-From 3ea1daa2cd04e122ebb6a3243ab1feca384ae42e Mon Sep 17 00:00:00 2001
+From b5fadfd9bfd78d8673d441ce4705ebceb7a50ff6 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:35 +0000
 Subject: [PATCH 09/47] X.509: struct x509_certificate needs struct tm
@@ -1158,7 +1158,7 @@ index e583ad0..2d01182 100644
 1.8.1.2
 
 
-From 1144614bf4b54b3ecd1cb9b9d222ad7eefb77c35 Mon Sep 17 00:00:00 2001
+From 443b99be01cbec691c167070e06fc50daae6fae0 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:35 +0000
 Subject: [PATCH 10/47] X.509: Add bits needed for PKCS#7
@@ -1256,7 +1256,7 @@ index 2d01182..a6ce46f 100644
 1.8.1.2
 
 
-From f9af91d7bbc59b8056ea2b2d1a823a7761cfe8ed Mon Sep 17 00:00:00 2001
+From 68b672c38edc579d748011074d8483e60761bbd4 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:36 +0000
 Subject: [PATCH 11/47] X.509: Embed public_key_signature struct and create
@@ -1524,7 +1524,7 @@ index 8cb2f70..b7c81d8 100644
 1.8.1.2
 
 
-From 2de8d6964a3f8315747ce5e19ef66a1ffaaa944c Mon Sep 17 00:00:00 2001
+From 6d48ecc0c731559306d1954477a6f0fc4f1be6d9 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:36 +0000
 Subject: [PATCH 12/47] X.509: Check the algorithm IDs obtained from parsing an
@@ -1565,7 +1565,7 @@ index b7c81d8..eb368d4 100644
 1.8.1.2
 
 
-From 223a5deb66e66e3640c18e9ef55c2966c9f1de9c Mon Sep 17 00:00:00 2001
+From f390f6cc3ad33dd08c9f89b10d78fa37168541bd Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:37 +0000
 Subject: [PATCH 13/47] X.509: Handle certificates that lack an
@@ -1612,7 +1612,7 @@ index eb368d4..0f55e3b 100644
 1.8.1.2
 
 
-From aa23db21b8b797d6052ae536fb025310750640cf Mon Sep 17 00:00:00 2001
+From 42c489d47a83cd4639d961b0bb4fb0fbda786e18 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:37 +0000
 Subject: [PATCH 14/47] X.509: Export certificate parse and free functions
@@ -1658,7 +1658,7 @@ index 931f069..9cf0e16 100644
 1.8.1.2
 
 
-From b97eb4015d28a2b9e6dfd2171cffbdbfa57f68e8 Mon Sep 17 00:00:00 2001
+From d7483c12fe9f5dbe9925fdfd9cb3eef6ea6b11a0 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:38 +0000
 Subject: [PATCH 15/47] PKCS#7: Implement a parser [RFC 2315]
@@ -2271,7 +2271,7 @@ index 6926db7..edeff85 100644
 1.8.1.2
 
 
-From 0a9dc315397d444892105a405b66e7b2efea5ca2 Mon Sep 17 00:00:00 2001
+From 4eed0acf5f18e017dc5f1ef0e2e97c46ec7ecd9f Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:38 +0000
 Subject: [PATCH 16/47] PKCS#7: Digest the data in a signed-data message
@@ -2445,7 +2445,7 @@ index 0000000..2f9f26c
 1.8.1.2
 
 
-From 2425aad19d67b462fa4dba829dc946a291621d60 Mon Sep 17 00:00:00 2001
+From 972d45348be27a3bb79329444ba8721ad8ec58b1 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:39 +0000
 Subject: [PATCH 17/47] PKCS#7: Find the right key in the PKCS#7 key list and
@@ -2544,7 +2544,7 @@ index 2f9f26c..3f6f0e2 100644
 1.8.1.2
 
 
-From 41b63d8f4c0efa6d3bbc8d941d7502725fa243d0 Mon Sep 17 00:00:00 2001
+From dc104f5714dc4ae16433bb190f6e76e1e089d5cb Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:39 +0000
 Subject: [PATCH 18/47] PKCS#7: Verify internal certificate chain
@@ -2660,7 +2660,7 @@ index 6b1d877..5e35fba 100644
 1.8.1.2
 
 
-From fa1e7dfa9408e557cd89f3a6bcb7d9044c515c75 Mon Sep 17 00:00:00 2001
+From d4865c3eaf6027f6ae88420061c4ccce8ab8f673 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:42 +0000
 Subject: [PATCH 19/47] PKCS#7: Find intersection between PKCS#7 message and
@@ -2867,7 +2867,7 @@ index 0000000..cc226f5
 1.8.1.2
 
 
-From c6001e8a866cb0fb91c270e9fb9f15d10e73af6b Mon Sep 17 00:00:00 2001
+From 93f38d7b1b4c69f1494b7355f177772f7a6f7f8d Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:39 +0000
 Subject: [PATCH 20/47] Provide PE binary definitions
@@ -3340,7 +3340,7 @@ index 0000000..9234aef
 1.8.1.2
 
 
-From 18b3c3296b8978b638b68181853fb5a6b6c91b46 Mon Sep 17 00:00:00 2001
+From 4a1c57d1ab27249c332745bd8ae6f9090320ae21 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:40 +0000
 Subject: [PATCH 21/47] pefile: Parse a PE binary to find a key and a signature
@@ -3634,7 +3634,7 @@ index 0000000..82bcaf6
 1.8.1.2
 
 
-From 7edf76fb2cc2c4b1c4fd762a8a36e2ebf98da632 Mon Sep 17 00:00:00 2001
+From ecd81cc1f7c7fd29f927542e58f48dfc9546d1fb Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:40 +0000
 Subject: [PATCH 22/47] pefile: Strip the wrapper off of the cert data block
@@ -3738,7 +3738,7 @@ index fb80cf0..f2d4df0 100644
 1.8.1.2
 
 
-From 0e1fce61c58270009a99b807f7023ce797257a1a Mon Sep 17 00:00:00 2001
+From 2d63f78e1c630bea430c00a3a3ab53b040aa1133 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:40 +0000
 Subject: [PATCH 23/47] pefile: Parse the presumed PKCS#7 content of the
@@ -3792,7 +3792,7 @@ index f2d4df0..056500f 100644
 1.8.1.2
 
 
-From 0c26064ba333e05c3e79a2aa400096cb39ac0e04 Mon Sep 17 00:00:00 2001
+From 786f781635b3717130680dd74d659fb7d859bf43 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:41 +0000
 Subject: [PATCH 24/47] pefile: Parse the "Microsoft individual code signing"
@@ -4035,7 +4035,7 @@ index edeff85..332dcf5 100644
 1.8.1.2
 
 
-From 50ea1d6116226f677cc58d4ec6659d5e74fb261c Mon Sep 17 00:00:00 2001
+From 51489aeb58b0eae9dc9777b7fcd5f2b0f359fb18 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:41 +0000
 Subject: [PATCH 25/47] pefile: Digest the PE binary and compare to the PKCS#7
@@ -4271,7 +4271,7 @@ index f1c8cc1..dfdb85e 100644
 1.8.1.2
 
 
-From e439ce7f7e9d8524b64513f7545b1b1ecd5e6ceb Mon Sep 17 00:00:00 2001
+From 330d4bfa5c8c35132f96f82611a7b67cd357c2b4 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 18 Jan 2013 13:58:35 +0000
 Subject: [PATCH 26/47] PEFILE: Validate PKCS#7 trust chain
@@ -4323,7 +4323,7 @@ index dfdb85e..edad948 100644
 1.8.1.2
 
 
-From 5df41da156b8ff7ac5560b4035d2f9cd9165859a Mon Sep 17 00:00:00 2001
+From 83e1d7749d539fd08cf90a7130d1f2e6894b1e9e Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 15 Jan 2013 15:33:42 +0000
 Subject: [PATCH 27/47] PEFILE: Load the contained key if we consider the
@@ -4414,7 +4414,7 @@ index 0f55e3b..c3e5a6d 100644
 1.8.1.2
 
 
-From 11175c4e58d42555e58ee33ac84cc7a4f8995f92 Mon Sep 17 00:00:00 2001
+From 9332a041cd9ac613e5ee3084277f2e8c8b86f2b0 Mon Sep 17 00:00:00 2001
 From: Chun-Yi Lee <joeyli.kernel@gmail.com>
 Date: Thu, 21 Feb 2013 19:23:49 +0800
 Subject: [PATCH 28/47] MODSIGN: Fix including certificate twice when the
@@ -4469,7 +4469,7 @@ index 0ca8c0a..ecbe73f 100644
 1.8.1.2
 
 
-From b95e8797fb4ca498d0421547248a099907c0159b Mon Sep 17 00:00:00 2001
+From 5bb88a55fb473ec01407a97dfab6876f6e06fbae Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Thu, 20 Sep 2012 10:40:56 -0400
 Subject: [PATCH 29/47] Secure boot: Add new capability
@@ -4506,7 +4506,7 @@ index ba478fa..7109e65 100644
 1.8.1.2
 
 
-From a9ceab83bf85047aaf856a3e8440379af0b7854c Mon Sep 17 00:00:00 2001
+From 13a2c2fd41d7058818b62adcef44bf45cdb63c33 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@redhat.com>
 Date: Thu, 20 Sep 2012 10:41:05 -0400
 Subject: [PATCH 30/47] SELinux: define mapping for new Secure Boot capability
@@ -4539,7 +4539,7 @@ index 14d04e6..ed99a2d 100644
 1.8.1.2
 
 
-From 0d9aa147ad57e39dec877671986f9515f5bb4cfa Mon Sep 17 00:00:00 2001
+From 54dde4c34a33b2d26b7301c4d516110d4169025e Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@redhat.com>
 Date: Thu, 20 Sep 2012 10:41:02 -0400
 Subject: [PATCH 31/47] Secure boot: Add a dummy kernel parameter that will
@@ -4605,7 +4605,7 @@ index e0573a4..c3f4e3e 100644
 1.8.1.2
 
 
-From 7c57aed9b55c5b53bd2c090b7219b14d31d43d9c Mon Sep 17 00:00:00 2001
+From 9adb0274e08a3b79b38fd4947f044fba7f9f65f5 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Thu, 20 Sep 2012 10:41:03 -0400
 Subject: [PATCH 32/47] efi: Enable secure boot lockdown automatically when
@@ -4751,7 +4751,7 @@ index 9bf2f1f..1bf382b 100644
 1.8.1.2
 
 
-From 011dfe9f317861b3eda05d2f646b324f13dd5b71 Mon Sep 17 00:00:00 2001
+From 76b1da1888fe494ee403d7bd3615d3559577c03d Mon Sep 17 00:00:00 2001
 From: Dave Howells <dhowells@redhat.com>
 Date: Tue, 23 Oct 2012 09:30:54 -0400
 Subject: [PATCH 33/47] Add EFI signature data types
@@ -4806,7 +4806,7 @@ index 1bf382b..8902faf 100644
 1.8.1.2
 
 
-From 43db0a42addcc13979d94f76d8509cae7e3a347c Mon Sep 17 00:00:00 2001
+From d9cffc8d14cc626121aa6c39c62bc3a0ed5b7adf Mon Sep 17 00:00:00 2001
 From: Dave Howells <dhowells@redhat.com>
 Date: Tue, 23 Oct 2012 09:36:28 -0400
 Subject: [PATCH 34/47] Add an EFI signature blob parser and key loader.
@@ -4986,7 +4986,7 @@ index 8902faf..ff3c599 100644
 1.8.1.2
 
 
-From d1fd85ceab15c3b04ae4f3cbda3c0f0bba93e6a5 Mon Sep 17 00:00:00 2001
+From 500ddf1d7e0c4f91eb5b8d276e890c68a5e28947 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@redhat.com>
 Date: Fri, 26 Oct 2012 12:36:24 -0400
 Subject: [PATCH 35/47] KEYS: Add a system blacklist keyring
@@ -5020,10 +5020,10 @@ index 8dabc39..e466de1 100644
  
  #endif /* _KEYS_SYSTEM_KEYRING_H */
 diff --git a/init/Kconfig b/init/Kconfig
-index 755bb7a..d456b7a 100644
+index 235b340..cecda2c 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1608,6 +1608,15 @@ config SYSTEM_TRUSTED_KEYRING
+@@ -1578,6 +1578,15 @@ config SYSTEM_TRUSTED_KEYRING
  
  	  Keys in this keyring are used by module signature checking.
  
@@ -5101,7 +5101,7 @@ index dae8778..2913c70 100644
 1.8.1.2
 
 
-From 143029b177dc16cbf27f4c0fd8e0472e2eeffcd0 Mon Sep 17 00:00:00 2001
+From 9b4dfeb07f9c166ce8966c6b0d388ef28de30b60 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@redhat.com>
 Date: Fri, 26 Oct 2012 12:42:16 -0400
 Subject: [PATCH 36/47] MODSIGN: Import certificates from UEFI Secure Boot
@@ -5146,10 +5146,10 @@ index ff3c599..8400949 100644
  	efi_guid_t guid;
  	u64 table;
 diff --git a/init/Kconfig b/init/Kconfig
-index d456b7a..aa7b461 100644
+index cecda2c..7c7ee99 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1715,6 +1715,15 @@ config MODULE_SIG_FORCE
+@@ -1685,6 +1685,15 @@ config MODULE_SIG_FORCE
  	  Reject unsigned modules or signed modules for which we don't have a
  	  key.  Without this, such modules will simply taint the kernel.
  
@@ -5287,7 +5287,7 @@ index 0000000..df831ff
 1.8.1.2
 
 
-From b0099b5ab477170b20c9b76f36e8d8b18bfe60b7 Mon Sep 17 00:00:00 2001
+From 128a3c36c23ab51d3a8f5ed6965f55d5630ff96a Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Thu, 20 Sep 2012 10:40:57 -0400
 Subject: [PATCH 37/47] PCI: Lock down BAR access in secure boot environments
@@ -5388,7 +5388,7 @@ index e1c1ec5..97e785f 100644
 1.8.1.2
 
 
-From e8e265b9308d3c8ac126f7c6928b8013c9868b2a Mon Sep 17 00:00:00 2001
+From 07b62d73214830c5600a0a452ea093042cfde30d Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Thu, 20 Sep 2012 10:40:58 -0400
 Subject: [PATCH 38/47] x86: Lock down IO port access in secure boot
@@ -5428,12 +5428,12 @@ index 8c96897..a2578c4 100644
  	}
  	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index c6fa3bc..fc28099 100644
+index 6f6e92a..9362b9b 100644
 --- a/drivers/char/mem.c
 +++ b/drivers/char/mem.c
 @@ -597,6 +597,9 @@ static ssize_t write_port(struct file *file, const char __user *buf,
  	unsigned long i = *ppos;
- 	const char __user * tmp = buf;
+ 	const char __user *tmp = buf;
  
 +	if (!capable(CAP_COMPROMISE_KERNEL))
 +		return -EPERM;
@@ -5445,7 +5445,7 @@ index c6fa3bc..fc28099 100644
 1.8.1.2
 
 
-From a672c5ea6688238ccfabf47ca1ab9eebf19fb44a Mon Sep 17 00:00:00 2001
+From 965aaf55d5bdb62d92a0246b949e5a4afbfd134d Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Thu, 20 Sep 2012 10:40:59 -0400
 Subject: [PATCH 39/47] ACPI: Limit access to custom_method
@@ -5477,7 +5477,7 @@ index 6adfc70..1417a22 100644
 1.8.1.2
 
 
-From 6d7adeb62f8396d0d5bebc2c99e5da2e20dd74e9 Mon Sep 17 00:00:00 2001
+From c0bb54849fae77c086078ad1f39dc48bca628b0b Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Thu, 20 Sep 2012 10:41:00 -0400
 Subject: [PATCH 40/47] asus-wmi: Restrict debugfs interface
@@ -5530,7 +5530,7 @@ index f80ae4d..059195f 100644
 1.8.1.2
 
 
-From 00b1cd446168136ddc9572cb4e16bde69f54339c Mon Sep 17 00:00:00 2001
+From 493d0f3a67e8cd023259dffcc685ff1ceabda25e Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Thu, 20 Sep 2012 10:41:01 -0400
 Subject: [PATCH 41/47] Restrict /dev/mem and /dev/kmem in secure boot setups
@@ -5544,7 +5544,7 @@ Signed-off-by: Matthew Garrett <mjg@redhat.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index fc28099..b5df7a8 100644
+index 9362b9b..3c55828 100644
 --- a/drivers/char/mem.c
 +++ b/drivers/char/mem.c
 @@ -158,6 +158,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf,
@@ -5558,7 +5558,7 @@ index fc28099..b5df7a8 100644
  		return -EFAULT;
  
 @@ -530,6 +533,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,
- 	char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
+ 	char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
  	int err = 0;
  
 +	if (!capable(CAP_COMPROMISE_KERNEL))
@@ -5571,7 +5571,7 @@ index fc28099..b5df7a8 100644
 1.8.1.2
 
 
-From afdf2e86bf1f6db3a87ce36b5b6d3ca7790001e9 Mon Sep 17 00:00:00 2001
+From c46f2e27aa0d8074060833d82e5a265ebd0226cd Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@redhat.com>
 Date: Thu, 20 Sep 2012 10:41:04 -0400
 Subject: [PATCH 42/47] acpi: Ignore acpi_rsdp kernel parameter in a secure
@@ -5606,7 +5606,7 @@ index 908b02d..3b03454 100644
 1.8.1.2
 
 
-From 8e52668f8a2b7e431fa83627643a6e032ff467db Mon Sep 17 00:00:00 2001
+From 4aec57a891eadb044fcb7327a094b1bdd5500ee0 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Tue, 4 Sep 2012 11:55:13 -0400
 Subject: [PATCH 43/47] kexec: Disable in a secure boot environment
@@ -5638,7 +5638,7 @@ index 5e4bd78..dd464e0 100644
 1.8.1.2
 
 
-From c0fc3cf2a10a11de3bedec8da48de086a3223220 Mon Sep 17 00:00:00 2001
+From 7ee9a84db6c2b7e0a759599fc130d2230656980c Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@redhat.com>
 Date: Fri, 5 Oct 2012 10:12:48 -0400
 Subject: [PATCH 44/47] MODSIGN: Always enforce module signing in a Secure Boot
@@ -5700,7 +5700,7 @@ index eab0827..93a16dc 100644
 1.8.1.2
 
 
-From dc252e295a06d2644fdc623324a3cf842cae2404 Mon Sep 17 00:00:00 2001
+From 391610a167485543c827c90d3cf0eb7c1a1d2471 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@redhat.com>
 Date: Fri, 26 Oct 2012 14:02:09 -0400
 Subject: [PATCH 45/47] hibernate: Disable in a Secure Boot environment
@@ -5814,7 +5814,7 @@ index 4ed81e7..b11a0f4 100644
 1.8.1.2
 
 
-From fda03ea8d295b9b7bf6fa384012471317b976c94 Mon Sep 17 00:00:00 2001
+From f18f493a03b58fe3aa068205a1555d43198ecb7e Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@redhat.com>
 Date: Tue, 5 Feb 2013 19:25:05 -0500
 Subject: [PATCH 46/47] efi: Disable secure boot if shim is in insecure mode
@@ -5873,7 +5873,7 @@ index 96bd86b..6e1331c 100644
 1.8.1.2
 
 
-From 66acdd343982f593403fc5de7b0d96071d111181 Mon Sep 17 00:00:00 2001
+From 5b9d42c881280380819f461639842ecf933e7c82 Mon Sep 17 00:00:00 2001
 From: Kees Cook <keescook@chromium.org>
 Date: Fri, 8 Feb 2013 11:12:13 -0800
 Subject: [PATCH 47/47] x86: Lock down MSR writing in secure boot
diff --git a/kernel.spec b/kernel.spec
index 12c56f0b2..bb1a4bc4f 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 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -667,7 +667,7 @@ Patch800: crash-driver.patch
 # crypto/
 
 # secure boot
-Patch1000: devel-pekey-secure-boot-20130221.patch
+Patch1000: devel-pekey-secure-boot-20130222.patch
 
 # virt + ksm patches
 
@@ -709,7 +709,6 @@ Patch14010: lis3-improve-handling-of-null-rate.patch
 
 # ARM
 Patch21000: arm-export-read_current_timer.patch
-Patch21001: arm-allnoconfig-error-__LINUX_ARM_ARCH__-undeclared.patch
 
 # IMX
 
@@ -734,9 +733,6 @@ Patch21247: ath9k_rx_dma_stop_check.patch
 #rhbz 844750
 Patch21250: 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
 
-#rhbz 909591
-Patch21255: usb-cypress-supertop.patch
-
 #rhbz 812111
 Patch21260: alps-v2.patch
 
@@ -1304,7 +1300,6 @@ ApplyPatch vmbugon-warnon.patch
 # ARM
 #
 ApplyPatch arm-export-read_current_timer.patch
-ApplyPatch arm-allnoconfig-error-__LINUX_ARM_ARCH__-undeclared.patch
 # ApplyPatch arm-tegra-nvec-kconfig.patch
 ApplyPatch arm-tegra-usb-no-reset-linux33.patch
 
@@ -1373,7 +1368,7 @@ ApplyPatch crash-driver.patch
 # crypto/
 
 # secure boot
-ApplyPatch devel-pekey-secure-boot-20130221.patch
+ApplyPatch devel-pekey-secure-boot-20130222.patch
 
 # Assorted Virt Fixes
 
@@ -1428,9 +1423,6 @@ ApplyPatch criu-no-expert.patch
 #rhbz 892811
 ApplyPatch ath9k_rx_dma_stop_check.patch
 
-#rhbz 909591
-ApplyPatch usb-cypress-supertop.patch
-
 #rhbz 844750
 ApplyPatch 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
 
@@ -2292,6 +2284,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Feb 22 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git4.1
+- Linux v3.8-6071-g8b5628a
+- Enable the rtl8192e driver (rhbz 913753)
+
 * Thu Feb 21 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git3.1
 - Linux v3.8-3195-g024e4ec
 - Shut up perf about missing build things we don't care about
diff --git a/sources b/sources
index 935756546..4d20e6e1f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 1c738edfc54e7c65faeb90c436104e2f  linux-3.8.tar.xz
-e2ee61dbb0994944a8d62bb755f32912  patch-3.8-git3.xz
+8b7f8c2e0c391b4fc0a8b419d15352db  patch-3.8-git4.xz
diff --git a/usb-cypress-supertop.patch b/usb-cypress-supertop.patch
deleted file mode 100644
index 3887dc59c..000000000
--- a/usb-cypress-supertop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1cd59b0d0b82c66135bf10ed3a87213a87e318ab Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@redhat.com>
-Date: Thu, 14 Feb 2013 09:29:55 -0500
-Subject: [PATCH] USB: usb-storage: unusual_devs update for Super TOP SATA
- bridge
-
-The current entry in unusual_cypress.h for the Super TOP SATA bridge devices
-seems to be causing corruption on newer revisions of this device.  This has
-been reported in Arch Linux and Fedora.  The original patch was tested on
-devices with bcdDevice of 1.60, whereas the newer devices report bcdDevice
-as 2.20.  Limit the UNUSUAL_DEV entry to devices less than 2.20.
-
-This fixes https://bugzilla.redhat.com/show_bug.cgi?id=909591
-
-Reported-by: Carsten S. <carsteniq@yahoo.com>
-Tested-by: Carsten S. <carsteniq@yahoo.com>
-CC: <stable@vger.kernel.org>
-Signed-off-by: Josh Boyer <jwboyer@redhat.com>
----
- drivers/usb/storage/unusual_cypress.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/usb/storage/unusual_cypress.h b/drivers/usb/storage/unusual_cypress.h
-index 2c85530..65a6a75 100644
---- a/drivers/usb/storage/unusual_cypress.h
-+++ b/drivers/usb/storage/unusual_cypress.h
-@@ -31,7 +31,7 @@ UNUSUAL_DEV(  0x04b4, 0x6831, 0x0000, 0x9999,
- 		"Cypress ISD-300LP",
- 		USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
- 
--UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x9999,
-+UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x0219,
- 		"Super Top",
- 		"USB 2.0  SATA BRIDGE",
- 		USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
--- 
-1.8.1.2
-