From 1c81678d15e6d31ec39e430cf6965caf5142b17c Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Thu, 30 Jan 2014 10:19:02 -0500
Subject: [PATCH] Linux v3.13-10094-g9b0cd30

---
 arm-imx6-utilite.patch | 9 ++++-----
 config-armv7           | 1 +
 config-armv7-lpae      | 1 +
 config-generic         | 3 +++
 config-x86-generic     | 2 ++
 kernel.spec            | 5 ++++-
 sources                | 2 +-
 7 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/arm-imx6-utilite.patch b/arm-imx6-utilite.patch
index 58a839a6e..6080a2695 100644
--- a/arm-imx6-utilite.patch
+++ b/arm-imx6-utilite.patch
@@ -79,17 +79,16 @@ index 0000000..1080215
 +	pinctrl-0 = <&pinctrl_uart4_1>;
 +	status = "okay";
 +};
+
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index b9d6a8b..b821d2c 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -137,6 +137,7 @@
- 	imx6dl-sabresd.dtb \
+@@ -159,6 +159,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
  	imx6dl-wandboard.dtb \
  	imx6q-arm2.dtb \
+ 	imx6q-cubox-i.dtb \
 +	imx6q-cm-fx6.dtb \
  	imx6q-phytec-pbab01.dtb \
  	imx6q-sabreauto.dtb \
  	imx6q-sabrelite.dtb \
--- 
-1.7.9.5
-
diff --git a/config-armv7 b/config-armv7
index 6f39af2ec..8b1fd0a17 100644
--- a/config-armv7
+++ b/config-armv7
@@ -318,6 +318,7 @@ CONFIG_TI_AM335X_ADC=m
 CONFIG_PWM_TIPWMSS=y
 CONFIG_SND_AM33XX_SOC_EVM=m
 # CONFIG_GPIO_DAVINCI is not set
+# CONFIG_DAVINCI_WATCHDOG is not set
 
 # i.MX
 CONFIG_MXC_IRQ_PRIOR=y
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 9f301c7e9..5ec30d1e8 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -113,6 +113,7 @@ CONFIG_SAMSUNG_USB2PHY=m
 CONFIG_SAMSUNG_USB3PHY=m
 # CONFIG_KEYSTONE_USB_PHY is not set
 # CONFIG_GPIO_DAVINCI is not set
+# CONFIG_DAVINCI_WATCHDOG is not set
 CONFIG_MMC_DW_EXYNOS=m
 CONFIG_RTC_DRV_S3C=m
 
diff --git a/config-generic b/config-generic
index d15d3d427..809b4832c 100644
--- a/config-generic
+++ b/config-generic
@@ -2740,6 +2740,7 @@ CONFIG_WM831X_WATCHDOG=m
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_W83697UG_WDT=m
 # CONFIG_MEN_A21_WDT is not set
+# CONFIG_GPIO_WATCHDOG is not set
 
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2847,6 +2848,7 @@ CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_I915_FBDEV=y
 # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
+# CONFIG_DRM_I915_UMS is not set
 CONFIG_DRM_VIA=m
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
@@ -2861,6 +2863,7 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_QXL=m
+CONFIG_DRM_BOCHS=m
 
 #
 # PCMCIA character devices
diff --git a/config-x86-generic b/config-x86-generic
index 51a02e054..c44b81f3a 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -204,6 +204,7 @@ CONFIG_COMPAL_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_CHROMEOS_PSTORE=m
 CONFIG_EEEPC_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_FUJITSU_LAPTOP=m
@@ -220,6 +221,7 @@ CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
 CONFIG_ASUS_WMI=m
 CONFIG_ASUS_NB_WMI=m
+CONFIG_HP_WIRELESS=m
 CONFIG_HP_WMI=m
 # CONFIG_INTEL_SCU_IPC is not set
 CONFIG_DELL_WMI=m
diff --git a/kernel.spec b/kernel.spec
index 6bc106154..65332beb8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 16
+%define gitrev 17
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -2049,6 +2049,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Thu Jan 30 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git17.1
+- Linux v3.13-10094-g9b0cd30
+
 * Thu Jan 30 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git16.1
 - Linux v3.13-9240-g1329311
 
diff --git a/sources b/sources
index 802a3b000..63ee077c6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 0ecbaf65c00374eb4a826c2f9f37606f  linux-3.13.tar.xz
 732d1952898b28d5ccc264cad77b0619  perf-man-3.13.tar.gz
-2eed1416ecd572f503d15b7357dda0e6  patch-3.13-git16.xz
+5c23515f7271ef9eb03c242a9305e2b7  patch-3.13-git17.xz