summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-01-22 09:17:27 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-01-22 10:02:15 -0500
commitf53e3d284dd2e9f5a3803afc0fcb54156b839ccd (patch)
tree45b60540eddf08873f8d46ac35f70017c7b0a3dc
parent1075524de66ca79f9f5ebccdb3889fa7feda43f3 (diff)
downloadkernel-f53e3d284dd2e9f5a3803afc0fcb54156b839ccd.tar.gz
kernel-f53e3d284dd2e9f5a3803afc0fcb54156b839ccd.tar.xz
kernel-f53e3d284dd2e9f5a3803afc0fcb54156b839ccd.zip
Linux v3.13-3260-g03d11a0
-rw-r--r--config-armv73
-rw-r--r--config-armv7-generic2
-rw-r--r--config-generic3
-rw-r--r--config-x86-32-generic2
-rw-r--r--kernel.spec5
-rw-r--r--sources2
6 files changed, 15 insertions, 2 deletions
diff --git a/config-armv7 b/config-armv7
index 5855b052a..134911266 100644
--- a/config-armv7
+++ b/config-armv7
@@ -537,6 +537,7 @@ CONFIG_SND_SOC_TEGRA_WM9712=m
CONFIG_SND_SOC_TEGRA20_AC97=m
CONFIG_SND_SOC_TEGRA30_AHUB=m
CONFIG_SND_SOC_TEGRA30_I2S=m
+# CONFIG_SND_SOC_TEGRA_MAX98090 is not set
# bool only, upstream aiming for modular in 3.14
# https://lkml.org/lkml/2013/11/18/47
@@ -630,6 +631,7 @@ CONFIG_REGULATOR_MAX8973=m
# CONFIG_MFD_MAX77686 is not set
# CONFIG_MFD_MAX77693 is not set
# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX14577 is not set
# CONFIG_MFD_AAT2870_CORE is not set
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_SMSC is not set
@@ -654,3 +656,4 @@ CONFIG_REGULATOR_MAX8973=m
# CONFIG_SOC_VF610 is not set
# CONFIG_ARM_CCI is not set
# CONFIG_MMC_TMIO is not set
+# CONFIG_SND_SOC_ADI is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index 56c372b95..b436c5307 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -258,6 +258,8 @@ CONFIG_PINCTRL_SINGLE=y
CONFIG_GENERIC_PINCONF=y
# CONFIG_PINCTRL_SAMSUNG is not set
# CONFIG_PINCTRL_EXYNOS4 is not set
+# CONFIG_PINCTRL_CAPRI is not set
+# CONFIG_PINCTRL_MSM8X74 is not set
# GPIO
# CONFIG_GPIO_EM is not set
diff --git a/config-generic b/config-generic
index a2b849e55..a78a9f6d0 100644
--- a/config-generic
+++ b/config-generic
@@ -2351,6 +2351,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
+# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_PASEMI=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
@@ -3915,6 +3916,7 @@ CONFIG_MFD_VIPERBOARD=m
# CONFIG_MFD_TPS65912 is not set
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_LP3943 is not set
#
# File systems
@@ -5035,6 +5037,7 @@ CONFIG_GPIO_VIPERBOARD=m
# CONFIG_GPIO_GRGPIO is not set
# CONFIG_GPIO_PL061 is not set
# CONFIG_GPIO_BCM_KONA is not set
+# CONFIG_GPIO_SCH311X is not set
# FIXME: Why?
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
diff --git a/config-x86-32-generic b/config-x86-32-generic
index f3c11b3d8..9e56a2b1c 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -229,3 +229,5 @@ CONFIG_BACKLIGHT_PWM=m
# CONFIG_MLX5_INFINIBAND is not set
# CONFIG_PINCTRL_SINGLE is not set
+# CONFIG_PINCTRL_CAPRI is not set
+# CONFIG_PINCTRL_MSM8X74 is not set
diff --git a/kernel.spec b/kernel.spec
index 7a4c6492a..5cf10cc61 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 2
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2096,6 +2096,9 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Jan 22 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git3.1
+- Linux v3.13-3260-g03d11a0
+
* Wed Jan 22 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git2.1
- Linux v3.13-2502-gec513b1
diff --git a/sources b/sources
index bcf89c666..60ab2c559 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
0ecbaf65c00374eb4a826c2f9f37606f linux-3.13.tar.xz
732d1952898b28d5ccc264cad77b0619 perf-man-3.13.tar.gz
-f30a544506ee2ff8349a9b87df6a55cc patch-3.13-git2.xz
+07347570939c0bc6639c17d1f64704a2 patch-3.13-git3.xz