Linux v3.13-10094-g9b0cd30

This commit is contained in:
Josh Boyer 2014-01-30 10:19:02 -05:00
parent 30edb93d37
commit 1c81678d15
7 changed files with 16 additions and 7 deletions

View File

@ -79,17 +79,16 @@ index 0000000..1080215
+ pinctrl-0 = <&pinctrl_uart4_1>; + pinctrl-0 = <&pinctrl_uart4_1>;
+ status = "okay"; + status = "okay";
+}; +};
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b9d6a8b..b821d2c 100644
--- a/arch/arm/boot/dts/Makefile --- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile
@@ -137,6 +137,7 @@ @@ -159,6 +159,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx6dl-sabresd.dtb \
imx6dl-wandboard.dtb \ imx6dl-wandboard.dtb \
imx6q-arm2.dtb \ imx6q-arm2.dtb \
imx6q-cubox-i.dtb \
+ imx6q-cm-fx6.dtb \ + imx6q-cm-fx6.dtb \
imx6q-phytec-pbab01.dtb \ imx6q-phytec-pbab01.dtb \
imx6q-sabreauto.dtb \ imx6q-sabreauto.dtb \
imx6q-sabrelite.dtb \ imx6q-sabrelite.dtb \
--
1.7.9.5

View File

@ -318,6 +318,7 @@ CONFIG_TI_AM335X_ADC=m
CONFIG_PWM_TIPWMSS=y CONFIG_PWM_TIPWMSS=y
CONFIG_SND_AM33XX_SOC_EVM=m CONFIG_SND_AM33XX_SOC_EVM=m
# CONFIG_GPIO_DAVINCI is not set # CONFIG_GPIO_DAVINCI is not set
# CONFIG_DAVINCI_WATCHDOG is not set
# i.MX # i.MX
CONFIG_MXC_IRQ_PRIOR=y CONFIG_MXC_IRQ_PRIOR=y

View File

@ -113,6 +113,7 @@ CONFIG_SAMSUNG_USB2PHY=m
CONFIG_SAMSUNG_USB3PHY=m CONFIG_SAMSUNG_USB3PHY=m
# CONFIG_KEYSTONE_USB_PHY is not set # CONFIG_KEYSTONE_USB_PHY is not set
# CONFIG_GPIO_DAVINCI is not set # CONFIG_GPIO_DAVINCI is not set
# CONFIG_DAVINCI_WATCHDOG is not set
CONFIG_MMC_DW_EXYNOS=m CONFIG_MMC_DW_EXYNOS=m
CONFIG_RTC_DRV_S3C=m CONFIG_RTC_DRV_S3C=m

View File

@ -2740,6 +2740,7 @@ CONFIG_WM831X_WATCHDOG=m
# CONFIG_DW_WATCHDOG is not set # CONFIG_DW_WATCHDOG is not set
CONFIG_W83697UG_WDT=m CONFIG_W83697UG_WDT=m
# CONFIG_MEN_A21_WDT is not set # CONFIG_MEN_A21_WDT is not set
# CONFIG_GPIO_WATCHDOG is not set
CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TIMERIOMEM=m
@ -2847,6 +2848,7 @@ CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y CONFIG_DRM_I915_KMS=y
CONFIG_DRM_I915_FBDEV=y CONFIG_DRM_I915_FBDEV=y
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
# CONFIG_DRM_I915_UMS is not set
CONFIG_DRM_VIA=m CONFIG_DRM_VIA=m
CONFIG_DRM_NOUVEAU=m CONFIG_DRM_NOUVEAU=m
CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG=5
@ -2861,6 +2863,7 @@ CONFIG_DRM_UDL=m
CONFIG_DRM_VMWGFX=m CONFIG_DRM_VMWGFX=m
CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_QXL=m CONFIG_DRM_QXL=m
CONFIG_DRM_BOCHS=m
# #
# PCMCIA character devices # PCMCIA character devices

View File

@ -204,6 +204,7 @@ CONFIG_COMPAL_LAPTOP=m
CONFIG_DELL_LAPTOP=m CONFIG_DELL_LAPTOP=m
CONFIG_CHROME_PLATFORMS=y CONFIG_CHROME_PLATFORMS=y
CONFIG_CHROMEOS_LAPTOP=m CONFIG_CHROMEOS_LAPTOP=m
CONFIG_CHROMEOS_PSTORE=m
CONFIG_EEEPC_LAPTOP=m CONFIG_EEEPC_LAPTOP=m
CONFIG_FUJITSU_TABLET=m CONFIG_FUJITSU_TABLET=m
CONFIG_FUJITSU_LAPTOP=m CONFIG_FUJITSU_LAPTOP=m
@ -220,6 +221,7 @@ CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m CONFIG_ACERHDF=m
CONFIG_ASUS_WMI=m CONFIG_ASUS_WMI=m
CONFIG_ASUS_NB_WMI=m CONFIG_ASUS_NB_WMI=m
CONFIG_HP_WIRELESS=m
CONFIG_HP_WMI=m CONFIG_HP_WMI=m
# CONFIG_INTEL_SCU_IPC is not set # CONFIG_INTEL_SCU_IPC is not set
CONFIG_DELL_WMI=m CONFIG_DELL_WMI=m

View File

@ -61,7 +61,7 @@ Summary: The Linux kernel
# The rc snapshot level # The rc snapshot level
%define rcrev 0 %define rcrev 0
# The git snapshot level # The git snapshot level
%define gitrev 16 %define gitrev 17
# Set rpm version accordingly # Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0 %define rpmversion 3.%{upstream_sublevel}.0
%endif %endif
@ -2049,6 +2049,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %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 * Thu Jan 30 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git16.1
- Linux v3.13-9240-g1329311 - Linux v3.13-9240-g1329311

View File

@ -1,3 +1,3 @@
0ecbaf65c00374eb4a826c2f9f37606f linux-3.13.tar.xz 0ecbaf65c00374eb4a826c2f9f37606f linux-3.13.tar.xz
732d1952898b28d5ccc264cad77b0619 perf-man-3.13.tar.gz 732d1952898b28d5ccc264cad77b0619 perf-man-3.13.tar.gz
2eed1416ecd572f503d15b7357dda0e6 patch-3.13-git16.xz 5c23515f7271ef9eb03c242a9305e2b7 patch-3.13-git17.xz