merge to: RobertCNelson/linux@7fe67a1

RobertCNelson · RobertCNelson · commit 2f6ccba6a5cc · 2014-01-20T15:33:32.000-06:00
Signed-off-by: Robert Nelson &lt;robertcnelson@gmail.com&gt;
diff --git a/patches/ref_multi_v7_defconfig b/patches/ref_multi_v7_defconfig
@@ -2310,6 +2310,7 @@ CONFIG_DW_APB_TIMER=y
 CONFIG_DW_APB_TIMER_OF=y
 CONFIG_ARMADA_370_XP_TIMER=y
 CONFIG_SUN4I_TIMER=y
+CONFIG_SUN5I_HSTIMER=y
 CONFIG_VT8500_TIMER=y
 CONFIG_CADENCE_TTC_TIMER=y
 CONFIG_CLKSRC_NOMADIK_MTU=y
diff --git a/version.sh b/version.sh
@@ -29,10 +29,10 @@ toolchain="gcc_linaro_gnueabihf_4_8"
 #Kernel/Build
 KERNEL_REL=3.13
 KERNEL_TAG=${KERNEL_REL}
-BUILD=armv7-devel-r1
+BUILD=armv7-devel-r2
 
 #v3.X-rcX + upto SHA
-KERNEL_SHA="a0fa1dd3cdbccec9597fe53b6177a9aa6e20f2f8"
+KERNEL_SHA="7fe67a1180db49d41a3f764c379a08f8e31580ec"
 
 #git branch
 #BRANCH="v3.13.x"
