diff --git a/config-arm-generic b/config-arm-generic index 39ea4d938..91c7ef1eb 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -127,7 +127,9 @@ CONFIG_SMC911X=m # CONFIG_TRANSPARENT_HUGEPAGE is not set # CONFIG_XEN is not set # CONFIG_DRM_RCAR_DU is not set +# CONFIG_I2C_RCAR is not set # CONFIG_DRM_SHMOBILE is not set +# CONFIG_I2C_SH_MOBILE is not set # CONFIG_MMC_DW_SOCFPGA is not set # CONFIG_ARM_SMMU is not set # CONFIG_I2C_NOMADIK is not set diff --git a/config-generic b/config-generic index 571fc32d9..cf15d1442 100644 --- a/config-generic +++ b/config-generic @@ -4714,6 +4714,7 @@ CONFIG_APM_POWER=m # CONFIG_CHARGER_PCF50633 is not set # CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_BQ24190 is not set +# CONFIG_CHARGER_BQ24735 is not set CONFIG_POWER_RESET=y # CONFIG_PDA_POWER is not set diff --git a/kernel.spec b/kernel.spec index 27bd2592b..6efbba241 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 6 +%define gitrev 7 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -2215,6 +2215,9 @@ fi # ||----w | # || || %changelog +* Tue Nov 19 2013 Josh Boyer - 3.13.0-0.rc0.git7.1 +- Linux v3.12-10553-g27b5c3f + * Sun Nov 17 2013 Peter Robinson - Fix up ARM usb gadget config to make it useful diff --git a/sources b/sources index 0ef3520d2..5b2b81e5c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ cc6ee608854e0da4b64f6c1ff8b6398c linux-3.12.tar.xz -c9b08ff012d65e9fdf9f95890872807a patch-3.12-git6.xz +f5bfced2bfad43f86ec852467de618b7 patch-3.12-git7.xz