bump kernels

4 files changed, 1006 insertions, 1364 deletions

diff --git a/target/arm/raspberry-pi/patches/3.10.49/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.10.51/raspberry-pi.patch
index c5d39e244..c5d39e244 100644
--- a/target/arm/raspberry-pi/patches/3.10.49/raspberry-pi.patch
+++ b/target/arm/raspberry-pi/patches/3.10.51/raspberry-pi.patch
diff --git a/target/arm/raspberry-pi/patches/3.12.24/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.12.26/raspberry-pi.patch
index c5e93d3fb..4cfea3f5d 100644
--- a/target/arm/raspberry-pi/patches/3.12.24/raspberry-pi.patch
+++ b/target/arm/raspberry-pi/patches/3.12.26/raspberry-pi.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-3.12.18/arch/arc/boot/dts/nsimosci.dts linux-rpi/arch/arc/boot/dts/nsimosci.dts
---- linux-3.12.18/arch/arc/boot/dts/nsimosci.dts	2014-04-18 11:14:28.000000000 +0200
-+++ linux-rpi/arch/arc/boot/dts/nsimosci.dts	2014-04-24 16:04:29.363023127 +0200
+diff -Nur linux-3.12.26.orig/arch/arc/boot/dts/nsimosci.dts linux-3.12.26/arch/arc/boot/dts/nsimosci.dts
+--- linux-3.12.26.orig/arch/arc/boot/dts/nsimosci.dts	2014-07-30 18:02:44.000000000 +0200
++++ linux-3.12.26/arch/arc/boot/dts/nsimosci.dts	2014-08-06 16:50:13.737956371 +0200
 @@ -11,16 +11,13 @@
  
  / {
@@ -38,9 +38,9 @@ diff -Nur linux-3.12.18/arch/arc/boot/dts/nsimosci.dts linux-rpi/arch/arc/boot/d
  		};
  
  		pgu0: pgu@c9000000 {
-diff -Nur linux-3.12.18/arch/arc/configs/nsimosci_defconfig linux-rpi/arch/arc/configs/nsimosci_defconfig
---- linux-3.12.18/arch/arc/configs/nsimosci_defconfig	2014-04-18 11:14:28.000000000 +0200
-+++ linux-rpi/arch/arc/configs/nsimosci_defconfig	2014-04-24 16:04:29.363023127 +0200
+diff -Nur linux-3.12.26.orig/arch/arc/configs/nsimosci_defconfig linux-3.12.26/arch/arc/configs/nsimosci_defconfig
+--- linux-3.12.26.orig/arch/arc/configs/nsimosci_defconfig	2014-07-30 18:02:44.000000000 +0200
++++ linux-3.12.26/arch/arc/configs/nsimosci_defconfig	2014-08-06 16:50:13.737956371 +0200
 @@ -54,7 +54,6 @@
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y
@@ -49,9 +49,9 @@ diff -Nur linux-3.12.18/arch/arc/configs/nsimosci_defconfig linux-rpi/arch/arc/c
  CONFIG_SERIAL_ARC=y
  CONFIG_SERIAL_ARC_CONSOLE=y
  # CONFIG_HW_RANDOM is not set
-diff -Nur linux-3.12.18/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi/arch/arm/configs/bcmrpi_cutdown_defconfig
---- linux-3.12.18/arch/arm/configs/bcmrpi_cutdown_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/configs/bcmrpi_cutdown_defconfig	2014-04-24 16:04:30.011029397 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.12.26/arch/arm/configs/bcmrpi_cutdown_defconfig
+--- linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/configs/bcmrpi_cutdown_defconfig	2014-08-06 16:50:13.737956371 +0200
 @@ -0,0 +1,503 @@
 +CONFIG_EXPERIMENTAL=y
 +# CONFIG_LOCALVERSION_AUTO is not set
@@ -556,9 +556,9 @@ diff -Nur linux-3.12.18/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi/arch
 +CONFIG_SPI=y
 +CONFIG_SPI_MASTER=y
 +CONFIG_SPI_BCM2708=m
-diff -Nur linux-3.12.18/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/configs/bcmrpi_defconfig
---- linux-3.12.18/arch/arm/configs/bcmrpi_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/configs/bcmrpi_defconfig	2014-04-24 16:04:30.011029397 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.26/arch/arm/configs/bcmrpi_defconfig
+--- linux-3.12.26.orig/arch/arm/configs/bcmrpi_defconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/configs/bcmrpi_defconfig	2014-08-06 16:50:13.753956496 +0200
 @@ -0,0 +1,1097 @@
 +# CONFIG_ARM_PATCH_PHYS_VIRT is not set
 +# CONFIG_LOCALVERSION_AUTO is not set
@@ -1657,9 +1657,9 @@ diff -Nur linux-3.12.18/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/con
 +# CONFIG_CRYPTO_HW is not set
 +CONFIG_CRC_ITU_T=y
 +CONFIG_LIBCRC32C=y
-diff -Nur linux-3.12.18/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi/arch/arm/configs/bcmrpi_emergency_defconfig
---- linux-3.12.18/arch/arm/configs/bcmrpi_emergency_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/configs/bcmrpi_emergency_defconfig	2014-04-24 16:04:30.011029397 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.12.26/arch/arm/configs/bcmrpi_emergency_defconfig
+--- linux-3.12.26.orig/arch/arm/configs/bcmrpi_emergency_defconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/configs/bcmrpi_emergency_defconfig	2014-08-06 16:50:13.777956685 +0200
 @@ -0,0 +1,532 @@
 +CONFIG_EXPERIMENTAL=y
 +# CONFIG_LOCALVERSION_AUTO is not set
@@ -2193,9 +2193,9 @@ diff -Nur linux-3.12.18/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi/ar
 +# CONFIG_CRYPTO_HW is not set
 +CONFIG_CRC_ITU_T=y
 +CONFIG_LIBCRC32C=y
-diff -Nur linux-3.12.18/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig
---- linux-3.12.18/arch/arm/configs/bcmrpi_quick_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig	2014-04-24 15:35:00.717527267 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.12.26/arch/arm/configs/bcmrpi_quick_defconfig
+--- linux-3.12.26.orig/arch/arm/configs/bcmrpi_quick_defconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/configs/bcmrpi_quick_defconfig	2014-08-06 16:50:13.777956685 +0200
 @@ -0,0 +1,197 @@
 +# CONFIG_ARM_PATCH_PHYS_VIRT is not set
 +CONFIG_LOCALVERSION="-quick"
@@ -2394,9 +2394,9 @@ diff -Nur linux-3.12.18/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi/arch/a
 +# CONFIG_CRYPTO_HW is not set
 +CONFIG_CRC_ITU_T=y
 +CONFIG_LIBCRC32C=y
-diff -Nur linux-3.12.18/arch/arm/include/asm/irqflags.h linux-rpi/arch/arm/include/asm/irqflags.h
---- linux-3.12.18/arch/arm/include/asm/irqflags.h	2014-04-18 11:14:28.000000000 +0200
-+++ linux-rpi/arch/arm/include/asm/irqflags.h	2014-04-24 16:04:30.027029552 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/include/asm/irqflags.h linux-3.12.26/arch/arm/include/asm/irqflags.h
+--- linux-3.12.26.orig/arch/arm/include/asm/irqflags.h	2014-07-30 18:02:44.000000000 +0200
++++ linux-3.12.26/arch/arm/include/asm/irqflags.h	2014-08-06 16:50:13.777956685 +0200
 @@ -145,12 +145,22 @@
  }
  
@@ -2423,10 +2423,10 @@ diff -Nur linux-3.12.18/arch/arm/include/asm/irqflags.h linux-rpi/arch/arm/inclu
  		:
  		: "r" (flags)
  		: "memory", "cc");
-diff -Nur linux-3.12.18/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig
---- linux-3.12.18/arch/arm/Kconfig	2014-04-18 11:14:28.000000000 +0200
-+++ linux-rpi/arch/arm/Kconfig	2014-04-24 16:04:29.515024597 +0200
-@@ -368,6 +368,24 @@
+diff -Nur linux-3.12.26.orig/arch/arm/Kconfig linux-3.12.26/arch/arm/Kconfig
+--- linux-3.12.26.orig/arch/arm/Kconfig	2014-07-30 18:02:44.000000000 +0200
++++ linux-3.12.26/arch/arm/Kconfig	2014-08-06 16:50:13.777956685 +0200
+@@ -369,6 +369,24 @@
  	  This enables support for systems based on Atmel
  	  AT91RM9200 and AT91SAM9* processors.
  
@@ -2451,7 +2451,7 @@ diff -Nur linux-3.12.18/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig
  config ARCH_CLPS711X
  	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
  	select ARCH_REQUIRE_GPIOLIB
-@@ -1043,6 +1061,7 @@
+@@ -1044,6 +1062,7 @@
  source "arch/arm/mach-vt8500/Kconfig"
  
  source "arch/arm/mach-w90x900/Kconfig"
@@ -2459,9 +2459,9 @@ diff -Nur linux-3.12.18/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig
  
  source "arch/arm/mach-zynq/Kconfig"
  
-diff -Nur linux-3.12.18/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug
---- linux-3.12.18/arch/arm/Kconfig.debug	2014-04-18 11:14:28.000000000 +0200
-+++ linux-rpi/arch/arm/Kconfig.debug	2014-04-24 16:04:29.515024597 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/Kconfig.debug linux-3.12.26/arch/arm/Kconfig.debug
+--- linux-3.12.26.orig/arch/arm/Kconfig.debug	2014-07-30 18:02:44.000000000 +0200
++++ linux-3.12.26/arch/arm/Kconfig.debug	2014-08-06 16:50:13.781956717 +0200
 @@ -847,6 +847,14 @@
  		  options; the platform specific options are deprecated
  		  and will be soon removed.
@@ -2477,9 +2477,9 @@ diff -Nur linux-3.12.18/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug
  endchoice
  
  config DEBUG_EXYNOS_UART
-diff -Nur linux-3.12.18/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm.S
---- linux-3.12.18/arch/arm/kernel/fiqasm.S	2014-04-18 11:14:28.000000000 +0200
-+++ linux-rpi/arch/arm/kernel/fiqasm.S	2014-04-24 16:04:30.039029668 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/kernel/fiqasm.S linux-3.12.26/arch/arm/kernel/fiqasm.S
+--- linux-3.12.26.orig/arch/arm/kernel/fiqasm.S	2014-07-30 18:02:44.000000000 +0200
++++ linux-3.12.26/arch/arm/kernel/fiqasm.S	2014-08-06 16:50:13.817956999 +0200
 @@ -47,3 +47,7 @@
  	mov	r0, r0		@ avoid hazard prior to ARMv4
  	mov	pc, lr
@@ -2488,9 +2488,9 @@ diff -Nur linux-3.12.18/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqas
 +ENTRY(__FIQ_Branch)
 +	mov pc, r8
 +ENDPROC(__FIQ_Branch)
-diff -Nur linux-3.12.18/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/process.c
---- linux-3.12.18/arch/arm/kernel/process.c	2014-04-18 11:14:28.000000000 +0200
-+++ linux-rpi/arch/arm/kernel/process.c	2014-04-24 16:04:30.039029668 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/kernel/process.c linux-3.12.26/arch/arm/kernel/process.c
+--- linux-3.12.26.orig/arch/arm/kernel/process.c	2014-07-30 18:02:44.000000000 +0200
++++ linux-3.12.26/arch/arm/kernel/process.c	2014-08-06 16:50:13.817956999 +0200
 @@ -176,6 +176,16 @@
  		default_idle();
  }
@@ -2508,9 +2508,9 @@ diff -Nur linux-3.12.18/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/proc
  /*
   * Called by kexec, immediately prior to machine_kexec().
   *
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-bcm2708/armctrl.c
---- linux-3.12.18/arch/arm/mach-bcm2708/armctrl.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/armctrl.c	2014-04-24 15:35:00.773527891 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.12.26/arch/arm/mach-bcm2708/armctrl.c
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/armctrl.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/armctrl.c	2014-08-06 16:50:13.821957030 +0200
 @@ -0,0 +1,219 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/armctrl.c
@@ -2731,9 +2731,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-
 +	init_FIQ(FIQ_START);
 +	return 0;
 +}
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-bcm2708/armctrl.h
---- linux-3.12.18/arch/arm/mach-bcm2708/armctrl.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/armctrl.h	2014-04-24 15:35:00.773527891 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.12.26/arch/arm/mach-bcm2708/armctrl.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/armctrl.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/armctrl.h	2014-08-06 16:50:13.821957030 +0200
 @@ -0,0 +1,27 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/armctrl.h
@@ -2762,9 +2762,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-
 +			       u32 armctrl_sources, u32 resume_sources);
 +
 +#endif
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-bcm2708/bcm2708.c
---- linux-3.12.18/arch/arm/mach-bcm2708/bcm2708.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.c	2014-04-24 16:04:30.051029784 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.12.26/arch/arm/mach-bcm2708/bcm2708.c
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/bcm2708.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/bcm2708.c	2014-08-06 16:50:13.821957030 +0200
 @@ -0,0 +1,1017 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/bcm2708.c
@@ -3783,9 +3783,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-
 +module_param(disk_led_active_low, uint, 0644);
 +module_param(reboot_part, uint, 0644);
 +module_param(w1_gpio_pin, uint, 0644);
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c
---- linux-3.12.18/arch/arm/mach-bcm2708/bcm2708_gpio.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c	2014-04-24 16:04:30.051029784 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.12.26/arch/arm/mach-bcm2708/bcm2708_gpio.c
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/bcm2708_gpio.c	2014-08-06 16:50:13.821957030 +0200
 @@ -0,0 +1,361 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/bcm2708_gpio.c
@@ -4148,9 +4148,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/
 +
 +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-bcm2708/bcm2708.h
---- linux-3.12.18/arch/arm/mach-bcm2708/bcm2708.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.h	2014-04-24 16:04:30.051029784 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.12.26/arch/arm/mach-bcm2708/bcm2708.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/bcm2708.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/bcm2708.h	2014-08-06 16:50:13.821957030 +0200
 @@ -0,0 +1,49 @@
 +/*
 + * linux/arch/arm/mach-bcm2708/bcm2708.h
@@ -4201,9 +4201,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-
 +}
 +
 +#endif
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/clock.c linux-rpi/arch/arm/mach-bcm2708/clock.c
---- linux-3.12.18/arch/arm/mach-bcm2708/clock.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/clock.c	2014-04-24 15:35:00.773527891 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/clock.c linux-3.12.26/arch/arm/mach-bcm2708/clock.c
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/clock.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/clock.c	2014-08-06 16:50:13.821957030 +0200
 @@ -0,0 +1,61 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/clock.c
@@ -4266,9 +4266,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/clock.c linux-rpi/arch/arm/mach-bc
 +	return -EIO;
 +}
 +EXPORT_SYMBOL(clk_set_rate);
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/clock.h linux-rpi/arch/arm/mach-bcm2708/clock.h
---- linux-3.12.18/arch/arm/mach-bcm2708/clock.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/clock.h	2014-04-24 15:35:00.773527891 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/clock.h linux-3.12.26/arch/arm/mach-bcm2708/clock.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/clock.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/clock.h	2014-08-06 16:50:13.821957030 +0200
 @@ -0,0 +1,24 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/clock.h
@@ -4294,9 +4294,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/clock.h linux-rpi/arch/arm/mach-bc
 +struct clk {
 +	unsigned long		rate;
 +};
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/dma.c linux-rpi/arch/arm/mach-bcm2708/dma.c
---- linux-3.12.18/arch/arm/mach-bcm2708/dma.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/dma.c	2014-04-24 15:35:00.773527891 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/dma.c linux-3.12.26/arch/arm/mach-bcm2708/dma.c
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/dma.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/dma.c	2014-08-06 16:50:13.821957030 +0200
 @@ -0,0 +1,407 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/dma.c
@@ -4705,9 +4705,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/dma.c linux-rpi/arch/arm/mach-bcm2
 +MODULE_LICENSE("GPL");
 +
 +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM");
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/arm_control.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/arm_control.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/arm_control.h	2014-08-06 16:50:13.825957062 +0200
 @@ -0,0 +1,419 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/arm_control.h
@@ -5128,9 +5128,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-r
 +#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c)
 +
 +#endif
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_power.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/arm_power.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_power.h	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/arm_power.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/arm_power.h	2014-08-06 16:50:13.825957062 +0200
 @@ -0,0 +1,60 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/include/mach/arm_power.h
@@ -5192,9 +5192,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi
 +};
 +
 +#endif
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/clkdev.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/clkdev.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/clkdev.h	2014-08-06 16:50:13.825957062 +0200
 @@ -0,0 +1,7 @@
 +#ifndef __ASM_MACH_CLKDEV_H
 +#define __ASM_MACH_CLKDEV_H
@@ -5203,9 +5203,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/ar
 +#define __clk_put(clk) do { } while (0)
 +
 +#endif
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/debug-macro.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S	2014-04-24 16:04:30.051029784 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.12.26/arch/arm/mach-bcm2708/include/mach/debug-macro.S
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/debug-macro.S	2014-08-06 16:50:13.825957062 +0200
 @@ -0,0 +1,22 @@
 +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S
 + *
@@ -5229,9 +5229,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-r
 +		.endm
 +
 +#include <debug/pl01x.S>
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/arm/mach-bcm2708/include/mach/dma.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/dma.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/dma.h	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/dma.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/dma.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/dma.h	2014-08-06 16:50:13.825957062 +0200
 @@ -0,0 +1,90 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/include/mach/dma.h
@@ -5323,9 +5323,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/
 +
 +
 +#endif /* _MACH_BCM2708_DMA_H */
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/entry-macro.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.12.26/arch/arm/mach-bcm2708/include/mach/entry-macro.S
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/entry-macro.S	2014-08-06 16:50:13.829957093 +0200
 @@ -0,0 +1,69 @@
 +/*
 + * arch/arm/mach-bcm2708/include/mach/entry-macro.S
@@ -5396,9 +5396,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-r
 +1020:	@ EQ will be set if no irqs pending
 +
 +		.endm
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/frc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/frc.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/frc.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/frc.h	2014-08-06 16:50:13.829957093 +0200
 @@ -0,0 +1,38 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/timex.h
@@ -5438,9 +5438,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/
 +extern unsigned long long frc_clock_ticks63(void);
 +
 +#endif
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/gpio.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h	2014-04-24 16:04:30.051029784 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/gpio.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/gpio.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/gpio.h	2014-08-06 16:50:13.829957093 +0200
 @@ -0,0 +1,17 @@
 +/*
 + * arch/arm/mach-bcm2708/include/mach/gpio.h
@@ -5459,9 +5459,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch
 +#define irq_to_gpio(x)	((x) - GPIO_IRQ_START)
 +
 +#endif
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/hardware.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/hardware.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/hardware.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/hardware.h	2014-08-06 16:50:13.857957313 +0200
 @@ -0,0 +1,28 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/hardware.h
@@ -5491,9 +5491,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/
 +#include <mach/platform.h>
 +
 +#endif
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/io.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/io.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/io.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/io.h	2014-08-06 16:50:13.865957376 +0200
 @@ -0,0 +1,27 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/io.h
@@ -5522,9 +5522,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/a
 +#define __io(a)		__typesafe_io(a)
 +
 +#endif
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/irqs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h	2014-04-24 16:04:30.051029784 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/irqs.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/irqs.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/irqs.h	2014-08-06 16:50:13.865957376 +0200
 @@ -0,0 +1,200 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/irqs.h
@@ -5726,9 +5726,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch
 +
 +
 +#endif /* _BCM2708_IRQS_H_ */
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/memory.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/memory.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/memory.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/memory.h	2014-08-06 16:50:13.869957407 +0200
 @@ -0,0 +1,57 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/memory.h
@@ -5787,9 +5787,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/ar
 +#define __bus_to_pfn(x)     __phys_to_pfn((x) - (BUS_OFFSET - PLAT_PHYS_OFFSET))
 +
 +#endif
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/platform.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/platform.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/platform.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/platform.h	2014-08-06 16:50:13.869957407 +0200
 @@ -0,0 +1,228 @@
 +/*
 + * arch/arm/mach-bcm2708/include/mach/platform.h
@@ -6019,9 +6019,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/
 +#endif
 +
 +/* END */
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/power.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/power.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/power.h	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/power.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/power.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/power.h	2014-08-06 16:50:13.869957407 +0200
 @@ -0,0 +1,26 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/power.h
@@ -6049,9 +6049,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi/arc
 +extern int bcm_power_close(BCM_POWER_HANDLE_T handle);
 +
 +#endif
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/system.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/system.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/system.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/system.h	2014-08-06 16:50:13.869957407 +0200
 @@ -0,0 +1,38 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/system.h
@@ -6091,9 +6091,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/ar
 +}
 +
 +#endif
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arch/arm/mach-bcm2708/include/mach/timex.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/timex.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/timex.h	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/timex.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/timex.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/timex.h	2014-08-06 16:50:13.873957439 +0200
 @@ -0,0 +1,23 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/timex.h
@@ -6118,9 +6118,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arc
 + */
 +
 +#define CLOCK_TICK_RATE		(1000000)
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi/arch/arm/mach-bcm2708/include/mach/uncompress.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/uncompress.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/uncompress.h	2014-04-24 16:04:30.051029784 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/uncompress.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/uncompress.h	2014-08-06 16:50:13.873957439 +0200
 @@ -0,0 +1,84 @@
 +/*
 + *  arch/arm/mach-bcn2708/include/mach/uncompress.h
@@ -6206,9 +6206,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rp
 + * nothing to do
 + */
 +#define arch_decomp_wdog()
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vcio.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/vcio.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vcio.h	2014-04-24 16:04:30.051029784 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/vcio.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/vcio.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/vcio.h	2014-08-06 16:50:13.873957439 +0200
 @@ -0,0 +1,141 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/vcio.h
@@ -6351,9 +6351,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi/arch
 +#define DEVICE_FILE_NAME "char_dev"
 +
 +#endif
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_mem.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/vc_mem.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_mem.h	2014-04-24 16:04:30.051029784 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/vc_mem.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/vc_mem.h	2014-08-06 16:50:13.873957439 +0200
 @@ -0,0 +1,35 @@
 +/*****************************************************************************
 +* Copyright 2010 - 2011 Broadcom Corporation.  All rights reserved.
@@ -6390,9 +6390,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi/ar
 +#endif
 +
 +#endif  /* VC_MEM_H */
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vmalloc.h
---- linux-3.12.18/arch/arm/mach-bcm2708/include/mach/vmalloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vmalloc.h	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.12.26/arch/arm/mach-bcm2708/include/mach/vmalloc.h
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/include/mach/vmalloc.h	2014-08-06 16:50:13.893957595 +0200
 @@ -0,0 +1,20 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/vmalloc.h
@@ -6414,9 +6414,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi/a
 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 + */
 +#define VMALLOC_END		(0xe8000000)
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bcm2708/Kconfig
---- linux-3.12.18/arch/arm/mach-bcm2708/Kconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/Kconfig	2014-04-24 16:04:30.051029784 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/Kconfig linux-3.12.26/arch/arm/mach-bcm2708/Kconfig
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/Kconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/Kconfig	2014-08-06 16:50:13.893957595 +0200
 @@ -0,0 +1,41 @@
 +menu "Broadcom BCM2708 Implementations"
 +	depends on ARCH_BCM2708
@@ -6459,9 +6459,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bc
 +	help
 +	  Binds spidev driver to the SPI0 master
 +endmenu
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-bcm2708/Makefile
---- linux-3.12.18/arch/arm/mach-bcm2708/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/Makefile	2014-04-24 16:04:30.051029784 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/Makefile linux-3.12.26/arch/arm/mach-bcm2708/Makefile
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/Makefile	2014-08-06 16:50:13.893957595 +0200
 @@ -0,0 +1,7 @@
 +#
 +# Makefile for the linux kernel.
@@ -6470,16 +6470,16 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-b
 +obj-$(CONFIG_MACH_BCM2708) 	+= clock.o bcm2708.o armctrl.o vcio.o power.o dma.o
 +obj-$(CONFIG_BCM2708_GPIO)	+= bcm2708_gpio.o
 +obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/Makefile.boot linux-rpi/arch/arm/mach-bcm2708/Makefile.boot
---- linux-3.12.18/arch/arm/mach-bcm2708/Makefile.boot	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/Makefile.boot	2014-04-24 15:35:00.773527891 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/Makefile.boot linux-3.12.26/arch/arm/mach-bcm2708/Makefile.boot
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/Makefile.boot	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/Makefile.boot	2014-08-06 16:50:13.893957595 +0200
 @@ -0,0 +1,3 @@
 +   zreladdr-y	:= 0x00008000
 +params_phys-y	:= 0x00000100
 +initrd_phys-y	:= 0x00800000
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/power.c linux-rpi/arch/arm/mach-bcm2708/power.c
---- linux-3.12.18/arch/arm/mach-bcm2708/power.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/power.c	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/power.c linux-3.12.26/arch/arm/mach-bcm2708/power.c
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/power.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/power.c	2014-08-06 16:50:13.897957627 +0200
 @@ -0,0 +1,194 @@
 +/*
 + *	 linux/arch/arm/mach-bcm2708/power.c
@@ -6675,9 +6675,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/power.c linux-rpi/arch/arm/mach-bc
 +MODULE_AUTHOR("Phil Elwell");
 +MODULE_DESCRIPTION("Interface to BCM2708 power management");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/vcio.c linux-rpi/arch/arm/mach-bcm2708/vcio.c
---- linux-3.12.18/arch/arm/mach-bcm2708/vcio.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/vcio.c	2014-04-24 16:04:30.051029784 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/vcio.c linux-3.12.26/arch/arm/mach-bcm2708/vcio.c
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/vcio.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/vcio.c	2014-08-06 16:50:13.897957627 +0200
 @@ -0,0 +1,474 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/vcio.c
@@ -7153,9 +7153,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/vcio.c linux-rpi/arch/arm/mach-bcm
 +MODULE_DESCRIPTION("ARM I/O to VideoCore processor");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:bcm-mbox");
-diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/vc_mem.c linux-rpi/arch/arm/mach-bcm2708/vc_mem.c
---- linux-3.12.18/arch/arm/mach-bcm2708/vc_mem.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi/arch/arm/mach-bcm2708/vc_mem.c	2014-04-24 15:35:00.777527936 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.12.26/arch/arm/mach-bcm2708/vc_mem.c
+--- linux-3.12.26.orig/arch/arm/mach-bcm2708/vc_mem.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.26/arch/arm/mach-bcm2708/vc_mem.c	2014-08-06 16:50:13.897957627 +0200
 @@ -0,0 +1,432 @@
 +/*****************************************************************************
 +* Copyright 2010 - 2011 Broadcom Corporation.  All rights reserved.
@@ -7589,9 +7589,9 @@ diff -Nur linux-3.12.18/arch/arm/mach-bcm2708/vc_mem.c linux-rpi/arch/arm/mach-b
 +module_param(mem_size, uint, 0644);
 +module_param(mem_base, uint, 0644);
 +
-diff -Nur linux-3.12.18/arch/arm/Makefile linux-rpi/arch/arm/Makefile
---- linux-3.12.18/arch/arm/Makefile	2014-04-18 11:14:28.000000000 +0200
-+++ linux-rpi/arch/arm/Makefile	2014-04-24 16:04:29.515024597 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/Makefile linux-3.12.26/arch/arm/Makefile
+--- linux-3.12.26.orig/arch/arm/Makefile	2014-07-30 18:02:44.000000000 +0200
++++ linux-3.12.26/arch/arm/Makefile	2014-08-06 16:50:13.897957627 +0200
 @@ -146,6 +146,7 @@
  # by CONFIG_* macro name.
  machine-$(CONFIG_ARCH_AT91)		+= at91
@@ -7600,9 +7600,9 @@ diff -Nur linux-3.12.18/arch/arm/Makefile linux-rpi/arch/arm/Makefile
  machine-$(CONFIG_ARCH_BCM2835)		+= bcm2835
  machine-$(CONFIG_ARCH_CLPS711X)		+= clps711x
  machine-$(CONFIG_ARCH_CNS3XXX)		+= cns3xxx
-diff -Nur linux-3.12.18/arch/arm/mm/Kconfig linux-rpi/arch/arm/mm/Kconfig
---- linux-3.12.18/arch/arm/mm/Kconfig	2014-04-18 11:14:28.000000000 +0200
-+++ linux-rpi/arch/arm/mm/Kconfig	2014-04-24 16:04:31.615044915 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mm/Kconfig linux-3.12.26/arch/arm/mm/Kconfig
+--- linux-3.12.26.orig/arch/arm/mm/Kconfig	2014-07-30 18:02:44.000000000 +0200
++++ linux-3.12.26/arch/arm/mm/Kconfig	2014-08-06 16:50:13.897957627 +0200
 @@ -358,7 +358,7 @@
  
  # ARMv6
@@ -7612,9 +7612,9 @@ diff -Nur linux-3.12.18/arch/arm/mm/Kconfig linux-rpi/arch/arm/mm/Kconfig
  	select CPU_32v6
  	select CPU_ABRT_EV6
  	select CPU_CACHE_V6
-diff -Nur linux-3.12.18/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S
---- linux-3.12.18/arch/arm/mm/proc-v6.S	2014-04-18 11:14:28.000000000 +0200
-+++ linux-rpi/arch/arm/mm/proc-v6.S	2014-04-24 16:04:31.627045031 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/mm/proc-v6.S linux-3.12.26/arch/arm/mm/proc-v6.S
+--- linux-3.12.26.orig/arch/arm/mm/proc-v6.S	2014-07-30 18:02:44.000000000 +0200
++++ linux-3.12.26/arch/arm/mm/proc-v6.S	2014-08-06 16:50:13.897957627 +0200
 @@ -73,10 +73,19 @@
   *
   *	IRQs are already disabled.
@@ -7638,9 +7638,9 @@ diff -Nur linux-3.12.18/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S
  	mov	pc, lr
  
  ENTRY(cpu_v6_dcache_clean_area)
-diff -Nur linux-3.12.18/arch/arm/tools/mach-types linux-rpi/arch/arm/tools/mach-types
---- linux-3.12.18/arch/arm/tools/mach-types	2014-04-18 11:14:28.000000000 +0200
-+++ linux-rpi/arch/arm/tools/mach-types	2014-04-24 15:35:00.985530254 +0200
+diff -Nur linux-3.12.26.orig/arch/arm/tools/mach-types linux-3.12.26/arch/arm/tools/mach-types
+--- linux-3.12.26.orig/arch/arm/tools/mach-types	2014-07-30 18:02:44.000000000 +0200
++++ linux-3.12.26/arch/arm/tools/mach-types	2014-08-06 16:50:13.901957659 +0200
 @@ -522,6 +522,7 @@
  prima2_evb		MACH_PRIMA2_EVB		PRIMA2_EVB		3103
  paz00			MACH_PAZ00		PAZ00			3128
@@ -7649,9 +7649,9 @@ diff -Nur linux-3.12.18/arch/arm/tools/mach-types linux-rpi/arch/arm/tools/mach-
  ag5evm			MACH_AG5EVM		AG5EVM			3189
  ics_if_voip		MACH_ICS_IF_VOIP	ICS_IF_VOIP		3206
  wlf_cragg_6410		MACH_WLF_CRAGG_6410	WLF_CRAGG_6410		3207
-diff -Nur linux-3.12.18/arch/m68k/Kconfig linux-rpi/arch/m68k/Kconfig
---- linux-3.12.18/arch/m68k/Kconfig	2014-04-18 11:14:28.000000000 +0200
-+++ linux-rpi/arch/m68k/Kconfig	2014-04-24 16:04:32.771056098 +0200
+diff -Nur linux-3.12.26.orig/arch/m68k/Kconfig linux-3.12.26/arch/m68k/Kconfig
+--- linux-3.12.26.orig/arch/m68k/Kconfig	2014-07-30 18:02:44.000000000 +0200
++++ linux-3.12.26/arch/m68k/Kconfig	2014-08-06 16:50:13.901957659 +0200
 @@ -16,7 +16,6 @@