Merge branch 'master' of git+ssh://openadk.org/git/openadk

1 files changed, 742 insertions, 172876 deletions

diff --git a/target/linux/patches/3.12.6/raspberry.patch b/target/linux/patches/3.12.6/raspberry.patch
index 3f34b3e41..6f1970d0a 100644
--- a/target/linux/patches/3.12.6/raspberry.patch
+++ b/target/linux/patches/3.12.6/raspberry.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_cutdown_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_cutdown_defconfig
---- linux-3.12.6/arch/arm/configs/bcmrpi_cutdown_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/configs/bcmrpi_cutdown_defconfig	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.12.6/arch/arm/configs/bcmrpi_cutdown_defconfig
+--- linux-3.12.6.orig/arch/arm/configs/bcmrpi_cutdown_defconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/configs/bcmrpi_cutdown_defconfig	2014-02-04 14:59:24.901989778 +0100
 @@ -0,0 +1,503 @@
 +CONFIG_EXPERIMENTAL=y
 +# CONFIG_LOCALVERSION_AUTO is not set
@@ -505,9 +505,9 @@ diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_cutdown_defconfig linux-raspberry
 +CONFIG_SPI=y
 +CONFIG_SPI_MASTER=y
 +CONFIG_SPI_BCM2708=m
-diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_defconfig
---- linux-3.12.6/arch/arm/configs/bcmrpi_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/configs/bcmrpi_defconfig	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.6/arch/arm/configs/bcmrpi_defconfig
+--- linux-3.12.6.orig/arch/arm/configs/bcmrpi_defconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/configs/bcmrpi_defconfig	2014-02-04 14:59:24.901989778 +0100
 @@ -0,0 +1,1092 @@
 +# CONFIG_ARM_PATCH_PHYS_VIRT is not set
 +# CONFIG_LOCALVERSION_AUTO is not set
@@ -1601,9 +1601,9 @@ diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arch
 +# CONFIG_CRYPTO_HW is not set
 +CONFIG_CRC_ITU_T=y
 +CONFIG_LIBCRC32C=y
-diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_emergency_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_emergency_defconfig
---- linux-3.12.6/arch/arm/configs/bcmrpi_emergency_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/configs/bcmrpi_emergency_defconfig	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.12.6/arch/arm/configs/bcmrpi_emergency_defconfig
+--- linux-3.12.6.orig/arch/arm/configs/bcmrpi_emergency_defconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/configs/bcmrpi_emergency_defconfig	2014-02-04 14:59:24.901989778 +0100
 @@ -0,0 +1,532 @@
 +CONFIG_EXPERIMENTAL=y
 +# CONFIG_LOCALVERSION_AUTO is not set
@@ -2137,9 +2137,9 @@ diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_emergency_defconfig linux-raspber
 +# CONFIG_CRYPTO_HW is not set
 +CONFIG_CRC_ITU_T=y
 +CONFIG_LIBCRC32C=y
-diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_quick_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_quick_defconfig
---- linux-3.12.6/arch/arm/configs/bcmrpi_quick_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/configs/bcmrpi_quick_defconfig	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.12.6/arch/arm/configs/bcmrpi_quick_defconfig
+--- linux-3.12.6.orig/arch/arm/configs/bcmrpi_quick_defconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/configs/bcmrpi_quick_defconfig	2014-02-04 14:59:24.901989778 +0100
 @@ -0,0 +1,197 @@
 +# CONFIG_ARM_PATCH_PHYS_VIRT is not set
 +CONFIG_LOCALVERSION="-quick"
@@ -2338,9 +2338,9 @@ diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_quick_defconfig linux-raspberry-p
 +# CONFIG_CRYPTO_HW is not set
 +CONFIG_CRC_ITU_T=y
 +CONFIG_LIBCRC32C=y
-diff -Nur linux-3.12.6/arch/arm/include/asm/fiq.h linux-raspberry-pi/arch/arm/include/asm/fiq.h
---- linux-3.12.6/arch/arm/include/asm/fiq.h	2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/include/asm/fiq.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/include/asm/fiq.h linux-3.12.6/arch/arm/include/asm/fiq.h
+--- linux-3.12.6.orig/arch/arm/include/asm/fiq.h	2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/include/asm/fiq.h	2014-02-04 14:59:24.905989786 +0100
 @@ -42,6 +42,7 @@
  /* helpers defined in fiqasm.S: */
  extern void __set_fiq_regs(unsigned long const *regs);
@@ -2349,9 +2349,9 @@ diff -Nur linux-3.12.6/arch/arm/include/asm/fiq.h linux-raspberry-pi/arch/arm/in
  
  static inline void set_fiq_regs(struct pt_regs const *regs)
  {
-diff -Nur linux-3.12.6/arch/arm/Kconfig linux-raspberry-pi/arch/arm/Kconfig
---- linux-3.12.6/arch/arm/Kconfig	2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/Kconfig	2013-12-29 10:40:20.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/Kconfig linux-3.12.6/arch/arm/Kconfig
+--- linux-3.12.6.orig/arch/arm/Kconfig	2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/Kconfig	2014-02-04 14:59:24.905989786 +0100
 @@ -368,6 +368,24 @@
  	  This enables support for systems based on Atmel
  	  AT91RM9200 and AT91SAM9* processors.
@@ -2385,9 +2385,9 @@ diff -Nur linux-3.12.6/arch/arm/Kconfig linux-raspberry-pi/arch/arm/Kconfig
  
  source "arch/arm/mach-zynq/Kconfig"
  
-diff -Nur linux-3.12.6/arch/arm/Kconfig.debug linux-raspberry-pi/arch/arm/Kconfig.debug
---- linux-3.12.6/arch/arm/Kconfig.debug	2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/Kconfig.debug	2013-12-29 10:40:20.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/Kconfig.debug linux-3.12.6/arch/arm/Kconfig.debug
+--- linux-3.12.6.orig/arch/arm/Kconfig.debug	2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/Kconfig.debug	2014-02-04 14:59:24.905989786 +0100
 @@ -847,6 +847,14 @@
  		  options; the platform specific options are deprecated
  		  and will be soon removed.
@@ -2403,9 +2403,9 @@ diff -Nur linux-3.12.6/arch/arm/Kconfig.debug linux-raspberry-pi/arch/arm/Kconfi
  endchoice
  
  config DEBUG_EXYNOS_UART
-diff -Nur linux-3.12.6/arch/arm/kernel/fiqasm.S linux-raspberry-pi/arch/arm/kernel/fiqasm.S
---- linux-3.12.6/arch/arm/kernel/fiqasm.S	2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/kernel/fiqasm.S	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/kernel/fiqasm.S linux-3.12.6/arch/arm/kernel/fiqasm.S
+--- linux-3.12.6.orig/arch/arm/kernel/fiqasm.S	2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/kernel/fiqasm.S	2014-02-04 14:59:24.905989786 +0100
 @@ -25,6 +25,9 @@
  ENTRY(__set_fiq_regs)
  	mov	r2, #PSR_I_BIT | PSR_F_BIT | FIQ_MODE
@@ -2424,9 +2424,9 @@ diff -Nur linux-3.12.6/arch/arm/kernel/fiqasm.S linux-raspberry-pi/arch/arm/kern
 +ENTRY(__FIQ_Branch)
 +	mov pc, r8
 +ENDPROC(__FIQ_Branch)
-diff -Nur linux-3.12.6/arch/arm/kernel/fiq.c linux-raspberry-pi/arch/arm/kernel/fiq.c
---- linux-3.12.6/arch/arm/kernel/fiq.c	2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/kernel/fiq.c	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/kernel/fiq.c linux-3.12.6/arch/arm/kernel/fiq.c
+--- linux-3.12.6.orig/arch/arm/kernel/fiq.c	2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/kernel/fiq.c	2014-02-04 14:59:24.905989786 +0100
 @@ -142,6 +142,7 @@
  EXPORT_SYMBOL(set_fiq_handler);
  EXPORT_SYMBOL(__set_fiq_regs);	/* defined in fiqasm.S */
@@ -2435,9 +2435,9 @@ diff -Nur linux-3.12.6/arch/arm/kernel/fiq.c linux-raspberry-pi/arch/arm/kernel/
  EXPORT_SYMBOL(claim_fiq);
  EXPORT_SYMBOL(release_fiq);
  EXPORT_SYMBOL(enable_fiq);
-diff -Nur linux-3.12.6/arch/arm/kernel/process.c linux-raspberry-pi/arch/arm/kernel/process.c
---- linux-3.12.6/arch/arm/kernel/process.c	2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/kernel/process.c	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/kernel/process.c linux-3.12.6/arch/arm/kernel/process.c
+--- linux-3.12.6.orig/arch/arm/kernel/process.c	2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/kernel/process.c	2014-02-04 14:59:24.905989786 +0100
 @@ -176,6 +176,16 @@
  		default_idle();
  }
@@ -2455,9 +2455,9 @@ diff -Nur linux-3.12.6/arch/arm/kernel/process.c linux-raspberry-pi/arch/arm/ker
  /*
   * Called by kexec, immediately prior to machine_kexec().
   *
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/armctrl.c linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.c
---- linux-3.12.6/arch/arm/mach-bcm2708/armctrl.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.c	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.12.6/arch/arm/mach-bcm2708/armctrl.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/armctrl.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/armctrl.c	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,219 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/armctrl.c
@@ -2678,9 +2678,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/armctrl.c linux-raspberry-pi/arch/a
 +	init_FIQ(FIQ_START);
 +	return 0;
 +}
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/armctrl.h linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.h
---- linux-3.12.6/arch/arm/mach-bcm2708/armctrl.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.12.6/arch/arm/mach-bcm2708/armctrl.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/armctrl.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/armctrl.h	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,27 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/armctrl.h
@@ -2709,9 +2709,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/armctrl.h linux-raspberry-pi/arch/a
 +			       u32 armctrl_sources, u32 resume_sources);
 +
 +#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.c linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.c
---- linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.c	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/bcm2708.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.c	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,985 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/bcm2708.c
@@ -3698,9 +3698,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.c linux-raspberry-pi/arch/a
 +module_param(serial, uint, 0644);
 +module_param(uart_clock, uint, 0644);
 +module_param(reboot_part, uint, 0644);
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708_gpio.c
---- linux-3.12.6/arch/arm/mach-bcm2708/bcm2708_gpio.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708_gpio.c	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.12.6/arch/arm/mach-bcm2708/bcm2708_gpio.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/bcm2708_gpio.c	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,339 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/bcm2708_gpio.c
@@ -4041,9 +4041,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-raspberry-pi/a
 +
 +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.h linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.h
---- linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/bcm2708.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.h	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,51 @@
 +/*
 + * linux/arch/arm/mach-bcm2708/bcm2708.h
@@ -4096,9 +4096,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.h linux-raspberry-pi/arch/a
 +}
 +
 +#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/clock.c linux-raspberry-pi/arch/arm/mach-bcm2708/clock.c
---- linux-3.12.6/arch/arm/mach-bcm2708/clock.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/clock.c	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/clock.c linux-3.12.6/arch/arm/mach-bcm2708/clock.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/clock.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/clock.c	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,61 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/clock.c
@@ -4161,9 +4161,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/clock.c linux-raspberry-pi/arch/arm
 +	return -EIO;
 +}
 +EXPORT_SYMBOL(clk_set_rate);
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/clock.h linux-raspberry-pi/arch/arm/mach-bcm2708/clock.h
---- linux-3.12.6/arch/arm/mach-bcm2708/clock.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/clock.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/clock.h linux-3.12.6/arch/arm/mach-bcm2708/clock.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/clock.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/clock.h	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,24 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/clock.h
@@ -4189,9 +4189,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/clock.h linux-raspberry-pi/arch/arm
 +struct clk {
 +	unsigned long		rate;
 +};
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/dma.c linux-raspberry-pi/arch/arm/mach-bcm2708/dma.c
---- linux-3.12.6/arch/arm/mach-bcm2708/dma.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/dma.c	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/dma.c linux-3.12.6/arch/arm/mach-bcm2708/dma.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/dma.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/dma.c	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,399 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/dma.c
@@ -4592,9 +4592,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/dma.c linux-raspberry-pi/arch/arm/m
 +MODULE_LICENSE("GPL");
 +
 +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM");
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/dmaer.c linux-raspberry-pi/arch/arm/mach-bcm2708/dmaer.c
---- linux-3.12.6/arch/arm/mach-bcm2708/dmaer.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/dmaer.c	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/dmaer.c linux-3.12.6/arch/arm/mach-bcm2708/dmaer.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/dmaer.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/dmaer.c	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,886 @@
 +#include <linux/init.h>
 +#include <linux/sched.h>
@@ -5482,9 +5482,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/dmaer.c linux-raspberry-pi/arch/arm
 +MODULE_AUTHOR("Simon Hall");
 +module_init(dmaer_init);
 +module_exit(dmaer_exit);
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_control.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_control.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_control.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_control.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_control.h	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,419 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/arm_control.h
@@ -5905,9 +5905,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-ra
 +#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c)
 +
 +#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_power.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_power.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_power.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_power.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_power.h	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,60 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/include/mach/arm_power.h
@@ -5969,9 +5969,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rasp
 +};
 +
 +#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/clkdev.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/clkdev.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/clkdev.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/clkdev.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/clkdev.h	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,7 @@
 +#ifndef __ASM_MACH_CLKDEV_H
 +#define __ASM_MACH_CLKDEV_H
@@ -5980,9 +5980,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-raspber
 +#define __clk_put(clk) do { } while (0)
 +
 +#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/debug-macro.S
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/debug-macro.S	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.12.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,22 @@
 +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S
 + *
@@ -6006,9 +6006,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-ra
 +		.endm
 +
 +#include <debug/pl01x.S>
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/dma.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/dma.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/dma.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/dma.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/dma.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/dma.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/dma.h	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,88 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/include/mach/dma.h
@@ -6098,9 +6098,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/dma.h linux-raspberry-
 +
 +
 +#endif /* _MACH_BCM2708_DMA_H */
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/entry-macro.S
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/entry-macro.S	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.12.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,69 @@
 +/*
 + * arch/arm/mach-bcm2708/include/mach/entry-macro.S
@@ -6171,9 +6171,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-ra
 +1020:	@ EQ will be set if no irqs pending
 +
 +		.endm
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/frc.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/frc.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/frc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/frc.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/frc.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/frc.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/frc.h	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,38 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/timex.h
@@ -6213,9 +6213,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/frc.h linux-raspberry-
 +extern unsigned long long frc_clock_ticks63(void);
 +
 +#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/gpio.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/gpio.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/gpio.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/gpio.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/gpio.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/gpio.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/gpio.h	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,17 @@
 +/*
 + * arch/arm/mach-bcm2708/include/mach/gpio.h
@@ -6234,9 +6234,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/gpio.h linux-raspberry
 +#define irq_to_gpio(x)	((x) - GPIO_IRQ_START)
 +
 +#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/hardware.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/hardware.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/hardware.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/hardware.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/hardware.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/hardware.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/hardware.h	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,28 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/hardware.h
@@ -6266,9 +6266,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/hardware.h linux-raspb
 +#include <mach/platform.h>
 +
 +#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/io.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/io.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/io.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/io.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/io.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/io.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/io.h	2014-02-04 14:59:24.905989786 +0100
 @@ -0,0 +1,27 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/io.h
@@ -6297,9 +6297,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/io.h linux-raspberry-p
 +#define __io(a)		__typesafe_io(a)
 +
 +#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/irqs.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/irqs.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/irqs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/irqs.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/irqs.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/irqs.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/irqs.h	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,199 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/irqs.h
@@ -6500,9 +6500,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/irqs.h linux-raspberry
 +
 +
 +#endif /* _BCM2708_IRQS_H_ */
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/memory.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/memory.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/memory.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/memory.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/memory.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/memory.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/memory.h	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,57 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/memory.h
@@ -6561,9 +6561,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/memory.h linux-raspber
 +#define __bus_to_pfn(x)     __phys_to_pfn((x) - (BUS_OFFSET - PLAT_PHYS_OFFSET))
 +
 +#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/platform.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/platform.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/platform.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/platform.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/platform.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/platform.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/platform.h	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,228 @@
 +/*
 + * arch/arm/mach-bcm2708/include/mach/platform.h
@@ -6793,9 +6793,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/platform.h linux-raspb
 +#endif
 +
 +/* END */
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/power.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/power.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/power.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/power.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/power.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/power.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/power.h	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,26 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/power.h
@@ -6823,9 +6823,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/power.h linux-raspberr
 +extern int bcm_power_close(BCM_POWER_HANDLE_T handle);
 +
 +#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/system.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/system.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/system.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/system.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/system.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/system.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/system.h	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,38 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/system.h
@@ -6865,9 +6865,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/system.h linux-raspber
 +}
 +
 +#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/timex.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/timex.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/timex.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/timex.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/timex.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/timex.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/timex.h	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,23 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/timex.h
@@ -6892,9 +6892,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/timex.h linux-raspberr
 + */
 +
 +#define CLOCK_TICK_RATE		(1000000)
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/uncompress.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/uncompress.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/uncompress.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/uncompress.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/uncompress.h	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,84 @@
 +/*
 + *  arch/arm/mach-bcn2708/include/mach/uncompress.h
@@ -6980,9 +6980,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-ras
 + * nothing to do
 + */
 +#define arch_decomp_wdog()
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vcio.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vcio.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vcio.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vcio.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vcio.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/vcio.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vcio.h	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,141 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/vcio.h
@@ -7125,9 +7125,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vcio.h linux-raspberry
 +#define DEVICE_FILE_NAME "char_dev"
 +
 +#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vc_mem.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vc_mem.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,35 @@
 +/*****************************************************************************
 +* Copyright 2010 - 2011 Broadcom Corporation.  All rights reserved.
@@ -7164,9 +7164,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-raspber
 +#endif
 +
 +#endif  /* VC_MEM_H */
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vc_support.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vc_support.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vc_support.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vc_support.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/vc_support.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vc_support.h	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,69 @@
 +#ifndef _VC_SUPPORT_H_
 +#define _VC_SUPPORT_H_
@@ -7237,9 +7237,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-ras
 +		unsigned int r0, unsigned int r1, unsigned int r2, unsigned int r3, unsigned int r4, unsigned int r5);
 +
 +#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vmalloc.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vmalloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vmalloc.h	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vmalloc.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vmalloc.h	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,20 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/vmalloc.h
@@ -7261,9 +7261,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-raspbe
 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 + */
 +#define VMALLOC_END		(0xe8000000)
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/Kconfig linux-raspberry-pi/arch/arm/mach-bcm2708/Kconfig
---- linux-3.12.6/arch/arm/mach-bcm2708/Kconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/Kconfig	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/Kconfig linux-3.12.6/arch/arm/mach-bcm2708/Kconfig
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/Kconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/Kconfig	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,49 @@
 +menu "Broadcom BCM2708 Implementations"
 +	depends on ARCH_BCM2708
@@ -7314,9 +7314,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/Kconfig linux-raspberry-pi/arch/arm
 +          Enable DMA helper for accelerating X composition
 +
 +endmenu
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/Makefile linux-raspberry-pi/arch/arm/mach-bcm2708/Makefile
---- linux-3.12.6/arch/arm/mach-bcm2708/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/Makefile	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/Makefile linux-3.12.6/arch/arm/mach-bcm2708/Makefile
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/Makefile	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,10 @@
 +#
 +# Makefile for the linux kernel.
@@ -7328,16 +7328,16 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/Makefile linux-raspberry-pi/arch/ar
 +
 +obj-$(CONFIG_BCM2708_DMAER)	+= dmaer_master.o
 +dmaer_master-objs		:= dmaer.o vc_support.o
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/Makefile.boot linux-raspberry-pi/arch/arm/mach-bcm2708/Makefile.boot
---- linux-3.12.6/arch/arm/mach-bcm2708/Makefile.boot	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/Makefile.boot	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/Makefile.boot linux-3.12.6/arch/arm/mach-bcm2708/Makefile.boot
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/Makefile.boot	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/Makefile.boot	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,3 @@
 +   zreladdr-y	:= 0x00008000
 +params_phys-y	:= 0x00000100
 +initrd_phys-y	:= 0x00800000
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/power.c linux-raspberry-pi/arch/arm/mach-bcm2708/power.c
---- linux-3.12.6/arch/arm/mach-bcm2708/power.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/power.c	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/power.c linux-3.12.6/arch/arm/mach-bcm2708/power.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/power.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/power.c	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,194 @@
 +/*
 + *	 linux/arch/arm/mach-bcm2708/power.c
@@ -7533,9 +7533,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/power.c linux-raspberry-pi/arch/arm
 +MODULE_AUTHOR("Phil Elwell");
 +MODULE_DESCRIPTION("Interface to BCM2708 power management");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/vcio.c linux-raspberry-pi/arch/arm/mach-bcm2708/vcio.c
---- linux-3.12.6/arch/arm/mach-bcm2708/vcio.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/vcio.c	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/vcio.c linux-3.12.6/arch/arm/mach-bcm2708/vcio.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/vcio.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/vcio.c	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,474 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/vcio.c
@@ -8011,9 +8011,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/vcio.c linux-raspberry-pi/arch/arm/
 +MODULE_DESCRIPTION("ARM I/O to VideoCore processor");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:bcm-mbox");
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/vc_mem.c linux-raspberry-pi/arch/arm/mach-bcm2708/vc_mem.c
---- linux-3.12.6/arch/arm/mach-bcm2708/vc_mem.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/vc_mem.c	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.12.6/arch/arm/mach-bcm2708/vc_mem.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/vc_mem.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/vc_mem.c	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,462 @@
 +/*****************************************************************************
 +* Copyright 2010 - 2011 Broadcom Corporation.  All rights reserved.
@@ -8477,9 +8477,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/vc_mem.c linux-raspberry-pi/arch/ar
 +module_param(mem_size, uint, 0644);
 +module_param(mem_base, uint, 0644);
 +
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/vc_support.c linux-raspberry-pi/arch/arm/mach-bcm2708/vc_support.c
---- linux-3.12.6/arch/arm/mach-bcm2708/vc_support.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/vc_support.c	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/vc_support.c linux-3.12.6/arch/arm/mach-bcm2708/vc_support.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/vc_support.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/vc_support.c	2014-02-04 14:59:24.909989794 +0100
 @@ -0,0 +1,318 @@
 +/*
 + * vc_support.c
@@ -8799,9 +8799,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/vc_support.c linux-raspberry-pi/arc
 +		return 1;
 +	}
 +}
-diff -Nur linux-3.12.6/arch/arm/Makefile linux-raspberry-pi/arch/arm/Makefile
---- linux-3.12.6/arch/arm/Makefile	2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/Makefile	2013-12-29 10:40:20.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/Makefile linux-3.12.6/arch/arm/Makefile
+--- linux-3.12.6.orig/arch/arm/Makefile	2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/Makefile	2014-02-04 14:59:24.909989794 +0100
 @@ -146,6 +146,7 @@
  # by CONFIG_* macro name.
  machine-$(CONFIG_ARCH_AT91)		+= at91
@@ -8810,9 +8810,9 @@ diff -Nur linux-3.12.6/arch/arm/Makefile linux-raspberry-pi/arch/arm/Makefile
  machine-$(CONFIG_ARCH_BCM2835)		+= bcm2835
  machine-$(CONFIG_ARCH_CLPS711X)		+= clps711x
  machine-$(CONFIG_ARCH_CNS3XXX)		+= cns3xxx
-diff -Nur linux-3.12.6/arch/arm/mm/Kconfig linux-raspberry-pi/arch/arm/mm/Kconfig
---- linux-3.12.6/arch/arm/mm/Kconfig	2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mm/Kconfig	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mm/Kconfig linux-3.12.6/arch/arm/mm/Kconfig
+--- linux-3.12.6.orig/arch/arm/mm/Kconfig	2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/mm/Kconfig	2014-02-04 14:59:24.909989794 +0100
 @@ -358,7 +358,7 @@
  
  # ARMv6
@@ -8822,9 +8822,9 @@ diff -Nur linux-3.12.6/arch/arm/mm/Kconfig linux-raspberry-pi/arch/arm/mm/Kconfi
  	select CPU_32v6
  	select CPU_ABRT_EV6
  	select CPU_CACHE_V6
-diff -Nur linux-3.12.6/arch/arm/mm/proc-v6.S linux-raspberry-pi/arch/arm/mm/proc-v6.S
---- linux-3.12.6/arch/arm/mm/proc-v6.S	2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mm/proc-v6.S	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mm/proc-v6.S linux-3.12.6/arch/arm/mm/proc-v6.S
+--- linux-3.12.6.orig/arch/arm/mm/proc-v6.S	2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/mm/proc-v6.S	2014-02-04 14:59:24.909989794 +0100
 @@ -73,10 +73,19 @@
   *
   *	IRQs are already disabled.
@@ -8848,9 +8848,9 @@ diff -Nur linux-3.12.6/arch/arm/mm/proc-v6.S linux-raspberry-pi/arch/arm/mm/proc
  	mov	pc, lr
  
  ENTRY(cpu_v6_dcache_clean_area)
-diff -Nur linux-3.12.6/arch/arm/tools/mach-types linux-raspberry-pi/arch/arm/tools/mach-types
---- linux-3.12.6/arch/arm/tools/mach-types	2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/tools/mach-types	2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/tools/mach-types linux-3.12.6/arch/arm/tools/mach-types
+--- linux-3.12.6.orig/arch/arm/tools/mach-types	2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/tools/mach-types	2014-02-04 14:59:24.909989794 +0100
 @@ -522,6 +522,7 @@
  prima2_evb		MACH_PRIMA2_EVB		PRIMA2_EVB		3103
  paz00			MACH_PAZ00		PAZ00			3128
@@ -8859,9 +8859,9 @@ diff -Nur linux-3.12.6/arch/arm/tools/mach-types linux-raspberry-pi/arch/arm/too
  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.6/Documentation/video4linux/bcm2835-v4l2.txt linux-raspberry-pi/Documentation/video4linux/bcm2835-v4l2.txt
---- linux-3.12.6/Documentation/video4linux/bcm2835-v4l2.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/Documentation/video4linux/bcm2835-v4l2.txt	2013-12-29 10:40:20