From 6bba8c50802d6a76bcb553db4dd54fb1efd7c4eb Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 6 Oct 2013 01:16:08 +0000
Subject: [PATCH] core/linux-mvebu to 3.12.0-2

---
 core/linux-mvebu/PKGBUILD   | 4 ++--
 core/linux-mvebu/mira.patch | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/linux-mvebu/PKGBUILD b/core/linux-mvebu/PKGBUILD
index 2555a457d..41bc83163 100644
--- a/core/linux-mvebu/PKGBUILD
+++ b/core/linux-mvebu/PKGBUILD
@@ -9,7 +9,7 @@ _srcname=linux-3.12-rc1
 _kernelname=${pkgbase#linux}
 _desc="Marvell SOCs with Device Tree support"
 pkgver=3.12.0
-pkgrel=1
+pkgrel=2
 arch=('armv7h')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -21,7 +21,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/testing/${_srcname}.tar.xz"
 md5sums=('f407382ea56f0831690e91d3c782bde1'
          '75136dbdc9153a90f419ae04a5a7a854'
          '8eb20ef02a6e25da0604848e3ed8f139'
-         'fc886c28d78be23cd963187a18f32a0f')
+         '8c5c265be2e8a640b1e0bde3326e5a6b')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
diff --git a/core/linux-mvebu/mira.patch b/core/linux-mvebu/mira.patch
index aac844da5..20aff4aac 100644
--- a/core/linux-mvebu/mira.patch
+++ b/core/linux-mvebu/mira.patch
@@ -15,11 +15,12 @@
  
  			usb@50000 {
 --- a/arch/arm/boot/dts/armada-370-xp.dtsi	2013-09-16 14:17:51.000000000 -0600
-+++ b/arch/arm/boot/dts/armada-370-xp.dtsi	2013-09-22 14:06:39.675039556 -0600
-@@ -210,7 +210,6 @@
++++ b/arch/arm/boot/dts/armada-370-xp.dtsi	2013-10-05 18:51:22.198159452 -0600
+@@ -209,8 +209,6 @@
+ 				clocks = <&gateclk 17>;
  				bus-width = <4>;
  				cap-sdio-irq;
- 				cap-sd-highspeed;
+-				cap-sd-highspeed;
 -				cap-mmc-highspeed;
  				status = "disabled";
  			};