diff --git a/config-arm b/config-arm
index 1f26e7233..dec424128 100644
--- a/config-arm
+++ b/config-arm
@@ -9,6 +9,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_ARCH_VERSATILE=y
 CONFIG_ARCH_VERSATILE_PB=y
 CONFIG_MACH_VERSATILE_AB=y
+CONFIG_MACH_VERSATILE_DT=y
 
 CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set
diff --git a/config-generic b/config-generic
index c16ee83c4..58eb5c9c0 100644
--- a/config-generic
+++ b/config-generic
@@ -2357,6 +2357,7 @@ CONFIG_IPMI_POWEROFF=m
 # Watchdog Cards
 #
 CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_WDTPCI=m
@@ -2391,6 +2392,7 @@ CONFIG_USBPCWATCHDOG=m
 CONFIG_WM8350_WATCHDOG=m
 CONFIG_WM831X_WATCHDOG=m
 # CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_DW_WATCHDOG is not set
 
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2542,6 +2544,7 @@ CONFIG_VIDEO_CX88_VP3054=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=y
 CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_ALSA=m
 CONFIG_VIDEO_CX231XX_DVB=m
@@ -2603,6 +2606,7 @@ CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
 CONFIG_MEDIA_TUNER_MC44S803=m
@@ -2615,6 +2619,7 @@ CONFIG_MEDIA_TUNER_TDA18212=m
 #
 CONFIG_DVB_CAPTURE_DRIVERS=y
 CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
 CONFIG_DVB_MAX_ADAPTERS=8
 CONFIG_DVB_DYNAMIC_MINORS=y
 
@@ -2623,6 +2628,8 @@ CONFIG_DVB_STB0899=m
 CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
 CONFIG_DVB_CX24110=m
 CONFIG_DVB_CX24123=m
 CONFIG_DVB_MT312=m
@@ -2708,6 +2715,7 @@ CONFIG_DVB_LGS8GL5=m
 CONFIG_DVB_DUMMY_FE=m
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
 CONFIG_DVB_MB86A20S=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
 CONFIG_DVB_DIB9000=m
@@ -2785,6 +2793,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
@@ -3279,6 +3288,7 @@ CONFIG_USB_GSPCA_SQ930X=m
 CONFIG_USB_GSPCA_NW80X=m
 CONFIG_USB_GSPCA_VICAM=m
 CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_SE401=m
 
 CONFIG_USB_IBMCAM=m
 CONFIG_USB_KONICAWC=m
@@ -3302,6 +3312,7 @@ CONFIG_SOC_CAMERA_MT9T112=m
 CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_OV9640=m
 CONFIG_SOC_CAMERA_OV6650=m
+CONFIG_SOC_CAMERA_OV5642=m
 CONFIG_SOC_CAMERA_IMX074=m
 CONFIG_SOC_CAMERA_OV2640=m
 CONFIG_SOC_CAMERA_OV9740=m
diff --git a/kernel.spec b/kernel.spec
index 43f4036c5..c435b527e 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 2
+%global baserelease 1
 %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 11
+%define gitrev 12
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -1876,6 +1876,9 @@ fi
 # and build.
 
 %changelog
+* Sat Jul 30 2011 Josh Boyer <jwboyer@redhat.com>
+- Linux 3.0-git12
+
 * Fri Jul 29 2011 Josh Boyer <jwboyer@redhat.com>
 - Adjust Makefile sedding to account for 3.x release style
 
diff --git a/sources b/sources
index d80a21509..209fb3d7f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2
-f7c0bce1da05a9fde516132fa7f85256  patch-3.0-git11.bz2
+2b696847f15e0bc101acfe4cfeb7367e  patch-3.0-git12.bz2