Linux v3.11-716-gb3b4911

5 files changed, 20 insertions, 7 deletions

diff --git a/config-armv7 b/config-armv7
index 2cb8c51d..5d171c81 100644
--- a/config-armv7
+++ b/config-armv7
@@ -120,6 +120,7 @@ CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_PM_NOOP=y
 CONFIG_DMA_OMAP=y
+CONFIG_TI_CPPI41=m
 CONFIG_OMAP_IOMMU=y
 CONFIG_OMAP_IOVMM=m
 CONFIG_HWSPINLOCK_OMAP=m
@@ -129,7 +130,8 @@ CONFIG_OMAP_WATCHDOG=m
 CONFIG_TWL4030_WATCHDOG=m
 
 CONFIG_TI_ST=m
-CONFIG_TI_EDMA=y
+# needs CONFIG_TI_PRIV_EDMA but nothing selects it
+# CONFIG_TI_EDMA is not set
 CONFIG_TI_SOC_THERMAL=m
 CONFIG_TI_DAC7512=m
 CONFIG_TI_DAVINCI_EMAC=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 95139317..5ebf72bf 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -263,6 +263,9 @@ CONFIG_MMC_DW_SOCFPGA=m
 # CONFIG_MMC_DW_IDMAC is not set
 CONFIG_USB_DWC2=m
 CONFIG_USB_DWC3=m
+CONFIG_USB_DWC3_OMAP=m
+CONFIG_USB_DWC3_EXYNOS=m
+CONFIG_USB_DWC3_PCI=m
 # CONFIG_USB_DWC3_DEBUG is not set
 CONFIG_DW_WATCHDOG=m
 
diff --git a/config-generic b/config-generic
index df1f1202..ffbae792 100644
--- a/config-generic
+++ b/config-generic
@@ -3225,9 +3225,15 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHCI_MV is not set
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FUSBH200_HCD=m
+# CONFIG_USB_FOTG210_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PCI=y
 # CONFIG_USB_OHCI_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
 CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_SL811_HCD=m
@@ -3236,8 +3242,6 @@ CONFIG_USB_SL811_HCD_ISO=y
 # CONFIG_USB_R8A66597_HCD is not set
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_FUSBH200_HCD=m
 
 #
 # USB Device Class drivers
@@ -3484,6 +3488,7 @@ CONFIG_USB_USS720=m
 #
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m
@@ -3578,6 +3583,7 @@ CONFIG_USB_PHY=y
 # CONFIG_OMAP_USB2 is not set
 # CONFIG_OMAP_USB3 is not set
 # CONFIG_OMAP_CONTROL_USB is not set
+# CONFIG_AM335X_PHY_USB is not set
 # CONFIG_SAMSUNG_USBPHY is not set
 # CONFIG_SAMSUNG_USB2PHY is not set
 # CONFIG_SAMSUNG_USB3PHY is not set
@@ -3594,8 +3600,6 @@ CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_DWC3 is not set
 # CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_ISIGHTFW=m
@@ -3622,6 +3626,7 @@ CONFIG_RADIO_SI4713=m
 CONFIG_USB_MR800=m
 CONFIG_USB_STKWEBCAM=m
 # CONFIG_USB_TEST is not set
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_UEAGLEATM=m
diff --git a/kernel.spec b/kernel.spec
index adc20d2c..458421d4 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 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -2317,6 +2317,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Thu Sep 05 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git2.1
+- Linux v3.11-716-gb3b4911
+
 * Wed Sep  4 2013 Peter Robinson <pbrobinson@fedoraproject.org>
 - Add patch set to fix MMC on AM33xx
 - Add support for BeagleBone Black (very basic!)
diff --git a/sources b/sources
index 54dcdbb8..6782968c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 fea363551ff45fbe4cb88497b863b261  linux-3.11.tar.xz
-91b5f56f18ff94ed394ab021297f74da  patch-3.11-git1.xz
+0cb412b57c61d844c1018b2ef54f32c0  patch-3.11-git2.xz