From 5e47baa67d5d4bdd348fa9ffd853f6ab54e78d72 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 17 Sep 2015 02:07:06 +0000
Subject: [PATCH] core/linux-veyron to 3.14.0-13

---
 core/linux-veyron/PKGBUILD | 6 +++---
 core/linux-veyron/config   | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/linux-veyron/PKGBUILD b/core/linux-veyron/PKGBUILD
index c7280f4de..fc831c852 100644
--- a/core/linux-veyron/PKGBUILD
+++ b/core/linux-veyron/PKGBUILD
@@ -7,8 +7,8 @@ pkgbase=linux-veyron
 _kernelname=${pkgbase#linux}
 _desc="Veyron Chromebooks"
 pkgver=3.14.0
-pkgrel=12
-_commit=6fa09265d61db1c29203c8194badebcfee86d97f
+pkgrel=13
+_commit=faa52508e7f21b775d7e731e4e243dd5cd1cab4d
 arch=('armv7h')
 url="https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-3.14"
 license=('GPL2')
@@ -37,7 +37,7 @@ md5sums=('SKIP'
          'a4ed8eff558abe5bea1eda89cdda2526'
          '1c666a868a11e8b799723673772079f4'
          'a04ae86c479589d5b638b26d9f6c5a8e'
-         'd3d0b4873f8b9c2d12fbc9e5dce98f75'
+         '4f8e94ba788104a775d3df727bdfba5c'
          'de337d0ec6c8d60d57af8d9e7d33b4ae'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
diff --git a/core/linux-veyron/config b/core/linux-veyron/config
index f19aa83ca..8273a7557 100644
--- a/core/linux-veyron/config
+++ b/core/linux-veyron/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.14.0-12 Kernel Configuration
+# Linux/arm 3.14.0-13 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -106,7 +106,7 @@ CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FAST_NO_HZ is not set
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_RCU_NOCB_CPU is not set
-CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_GENERIC_SCHED_CLOCK=y
@@ -2765,13 +2765,15 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # ARM GPU Configuration
 #
 CONFIG_MALI_MIDGARD=y
+CONFIG_MALI_TIMELINE_DISABLED=y
 # CONFIG_MALI_GATOR_SUPPORT is not set
+# CONFIG_MALI_MIPE_ENABLED is not set
 CONFIG_MALI_MIDGARD_DVFS=y
 # CONFIG_MALI_MIDGARD_RT_PM is not set
 # CONFIG_MALI_MIDGARD_ENABLE_TRACE is not set
 CONFIG_MALI_MIDGARD_DEBUG_SYS=y
-CONFIG_MALI_EXPERT=y
 # CONFIG_MALI_DEVFREQ is not set
+CONFIG_MALI_EXPERT=y
 # CONFIG_MALI_DEBUG_SHADER_SPLIT_FS is not set
 CONFIG_MALI_PLATFORM_FAKE=y
 CONFIG_MALI_PLATFORM_THIRDPARTY=y