merge to: https://github.com/RobertCNelson/linux/commit/683b6c6f82a60fabf47012581c2cfbf1b037ab95

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

patches/defconfig

@@ -4458,6 +4458,10 @@ CONFIG_SUN5I_HSTIMER=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 CONFIG_VF_PIT_TIMER=y
+# CONFIG_SH_TIMER_CMT is not set
+# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_EM_TIMER_STI is not set
 CONFIG_MAILBOX=y
 CONFIG_OMAP_MBOX=y
 CONFIG_OMAP2PLUS_MBOX=y

patches/example_imx_v6_v7_defconfig

@@ -3006,6 +3006,10 @@ CONFIG_COMMON_CLK=y
 CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_VF_PIT_TIMER=y
+# CONFIG_SH_TIMER_CMT is not set
+# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_EM_TIMER_STI is not set
 # CONFIG_MAILBOX is not set
 # CONFIG_IOMMU_SUPPORT is not set
 

patches/example_omap2plus_defconfig

@@ -2624,6 +2624,10 @@ CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+# CONFIG_SH_TIMER_CMT is not set
+# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_EM_TIMER_STI is not set
 # CONFIG_MAILBOX is not set
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_OF_IOMMU=y

patches/ref_multi_v7_defconfig

@@ -3503,6 +3503,10 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 CONFIG_ARM_GLOBAL_TIMER=y
 CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 CONFIG_VF_PIT_TIMER=y
+# CONFIG_SH_TIMER_CMT is not set
+# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_EM_TIMER_STI is not set
 CONFIG_MAILBOX=y
 CONFIG_PL320_MBOX=y
 # CONFIG_OMAP2PLUS_MBOX is not set

version.sh

@@ -29,10 +29,10 @@ toolchain="gcc_linaro_gnueabihf_4_8"
 #Kernel/Build
 KERNEL_REL=3.14
 KERNEL_TAG=${KERNEL_REL}
-BUILD=armv7-devel-r1
+BUILD=armv7-devel-r2
 
 #v3.X-rcX + upto SHA
-KERNEL_SHA="01d5f3b598b18a5035426c30801adf65822dbd0c"
+KERNEL_SHA="683b6c6f82a60fabf47012581c2cfbf1b037ab95"
 
 #git branch
 #BRANCH="v3.15.x"