summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-24 17:12:26 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-24 17:12:26 +0200
commitd5bcfc9feb6a785ee9bf068cf001cb34f9b133c3 (patch)
treedc799ede8f15fc9a6e313efd78cdd30019d6e367
parent94c82fcf15415a015b602a58a26880bb0ad97da4 (diff)
update 3.10 kernel
-rw-r--r--Config.in6
-rw-r--r--mk/kernel-ver.mk6
-rw-r--r--target/arm/cubox-i/patches/3.10.37/solidrun-cubox-i.patch (renamed from target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch)0
-rw-r--r--target/arm/raspberry-pi/patches/3.10.37/raspberry-pi.patch (renamed from target/arm/raspberry-pi/patches/3.10.36/raspberry-pi.patch)1559
-rw-r--r--target/linux/config/Config.in.netfilter.ip44
-rw-r--r--target/linux/patches/3.10.37/bsd-compatibility.patch (renamed from target/linux/patches/3.10.36/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.10.37/startup.patch (renamed from target/linux/patches/3.10.36/startup.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.10.36/headers-install.patch91
-rw-r--r--toolchain/kernel-headers/patches/3.10.37/headers-install.patch11
-rw-r--r--toolchain/kernel-headers/patches/3.10.37/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.10.36/mkpiggy.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.10.37/relocs.patch (renamed from toolchain/kernel-headers/patches/3.10.36/relocs.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.10.37/sgidefs.patch (renamed from toolchain/kernel-headers/patches/3.10.36/sgidefs.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.10.37/sortext.patch (renamed from toolchain/kernel-headers/patches/3.10.36/sortext.patch)0
13 files changed, 800 insertions, 877 deletions
diff --git a/Config.in b/Config.in
index cc8cf243a..ef7080bba 100644
--- a/Config.in
+++ b/Config.in
@@ -123,8 +123,8 @@ config ADK_KERNEL_VERSION_3_11_10
prompt "3.11.10"
boolean
-config ADK_KERNEL_VERSION_3_10_36
- prompt "3.10.36"
+config ADK_KERNEL_VERSION_3_10_37
+ prompt "3.10.37"
boolean
config ADK_KERNEL_VERSION_3_4_84
@@ -140,7 +140,7 @@ config ADK_KERNEL_VERSION
default "3.13.11" if ADK_KERNEL_VERSION_3_13_11
default "3.12.18" if ADK_KERNEL_VERSION_3_12_18
default "3.11.10" if ADK_KERNEL_VERSION_3_11_10
- default "3.10.36" if ADK_KERNEL_VERSION_3_10_36
+ default "3.10.37" if ADK_KERNEL_VERSION_3_10_37
default "3.4.84" if ADK_KERNEL_VERSION_3_4_84
help
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 5e9002792..110962020 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -28,11 +28,11 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
KERNEL_MD5SUM:= 59f352d3f4e2cdf6755f79e09fa09176
endif
-ifeq ($(ADK_KERNEL_VERSION_3_10_36),y)
-KERNEL_VERSION:= 3.10.36
+ifeq ($(ADK_KERNEL_VERSION_3_10_37),y)
+KERNEL_VERSION:= 3.10.37
KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
-KERNEL_MD5SUM:= 721f76050755ec8ec88876ee350a2726
+KERNEL_MD5SUM:= a08a10ffc31b07d9422af1cd2baa3274
endif
ifeq ($(ADK_KERNEL_VERSION_3_4_84),y)
KERNEL_VERSION:= 3.4.84
diff --git a/target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch b/target/arm/cubox-i/patches/3.10.37/solidrun-cubox-i.patch
index 87c955bdf..87c955bdf 100644
--- a/target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch
+++ b/target/arm/cubox-i/patches/3.10.37/solidrun-cubox-i.patch
diff --git a/target/arm/raspberry-pi/patches/3.10.36/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.10.37/raspberry-pi.patch
index bb50393a9..c5d39e244 100644
--- a/target/arm/raspberry-pi/patches/3.10.36/raspberry-pi.patch
+++ b/target/arm/raspberry-pi/patches/3.10.37/raspberry-pi.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.10.36/arch/arm/configs/bcmrpi_cutdown_defconfig
---- linux-3.10.36.orig/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi/arch/arm/configs/bcmrpi_cutdown_defconfig
+--- linux-3.10.37/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 15:35:00.717527267 +0200
@@ -0,0 +1,504 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
@@ -506,10 +506,10 @@ diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_BCM2708=m
+
-diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_defconfig linux-3.10.36/arch/arm/configs/bcmrpi_defconfig
---- linux-3.10.36.orig/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/configs/bcmrpi_defconfig 2014-04-13 17:32:40.000000000 +0200
-@@ -0,0 +1,1098 @@
+diff -Nur linux-3.10.37/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/configs/bcmrpi_defconfig
+--- linux-3.10.37/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/configs/bcmrpi_defconfig 2014-04-24 15:35:00.717527267 +0200
+@@ -0,0 +1,1101 @@
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
@@ -994,6 +994,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_defconfig linux-3.10.36/arc
+CONFIG_AR5523=m
+CONFIG_B43=m
+CONFIG_B43LEGACY=m
++CONFIG_BRCMFMAC=m
++# CONFIG_BRCMFMAC_SDIO is not set
++CONFIG_BRCMFMAC_USB=y
+CONFIG_HOSTAP=m
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
@@ -1608,9 +1611,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_defconfig linux-3.10.36/arc
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.10.36/arch/arm/configs/bcmrpi_quick_defconfig
---- linux-3.10.36.orig/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/configs/bcmrpi_quick_defconfig 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig
+--- linux-3.10.37/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
@@ -0,0 +1,197 @@
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+CONFIG_LOCALVERSION="-quick"
@@ -1809,9 +1812,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.10.
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-diff -Nur linux-3.10.36.orig/arch/arm/include/asm/fiq.h linux-3.10.36/arch/arm/include/asm/fiq.h
---- linux-3.10.36.orig/arch/arm/include/asm/fiq.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/arch/arm/include/asm/fiq.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/include/asm/fiq.h linux-rpi/arch/arm/include/asm/fiq.h
+--- linux-3.10.37/arch/arm/include/asm/fiq.h 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/arch/arm/include/asm/fiq.h 2014-04-24 15:35:00.733527446 +0200
@@ -42,6 +42,7 @@
/* helpers defined in fiqasm.S: */
extern void __set_fiq_regs(unsigned long const *regs);
@@ -1820,9 +1823,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/include/asm/fiq.h linux-3.10.36/arch/arm/i
static inline void set_fiq_regs(struct pt_regs const *regs)
{
-diff -Nur linux-3.10.36.orig/arch/arm/Kconfig linux-3.10.36/arch/arm/Kconfig
---- linux-3.10.36.orig/arch/arm/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/arch/arm/Kconfig 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig
+--- linux-3.10.37/arch/arm/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/arch/arm/Kconfig 2014-04-24 15:35:00.677526821 +0200
@@ -361,6 +361,24 @@
This enables support for systems based on Atmel
AT91RM9200 and AT91SAM9* processors.
@@ -1856,9 +1859,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/Kconfig linux-3.10.36/arch/arm/Kconfig
source "arch/arm/mach-zynq/Kconfig"
-diff -Nur linux-3.10.36.orig/arch/arm/Kconfig.debug linux-3.10.36/arch/arm/Kconfig.debug
---- linux-3.10.36.orig/arch/arm/Kconfig.debug 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/arch/arm/Kconfig.debug 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug
+--- linux-3.10.37/arch/arm/Kconfig.debug 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/arch/arm/Kconfig.debug 2014-04-24 15:35:00.677526821 +0200
@@ -519,6 +519,14 @@
For more details about semihosting, please see
chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd.
@@ -1874,9 +1877,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/Kconfig.debug linux-3.10.36/arch/arm/Kconf
endchoice
config DEBUG_EXYNOS_UART
-diff -Nur linux-3.10.36.orig/arch/arm/kernel/armksyms.c linux-3.10.36/arch/arm/kernel/armksyms.c
---- linux-3.10.36.orig/arch/arm/kernel/armksyms.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/arch/arm/kernel/armksyms.c 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/kernel/armksyms.c linux-rpi/arch/arm/kernel/armksyms.c
+--- linux-3.10.37/arch/arm/kernel/armksyms.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/arch/arm/kernel/armksyms.c 2014-04-24 15:35:00.745527579 +0200
@@ -156,3 +156,7 @@
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT
EXPORT_SYMBOL(__pv_phys_offset);
@@ -1885,9 +1888,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/kernel/armksyms.c linux-3.10.36/arch/arm/k
+extern void v6wbi_flush_kern_tlb_range(void);
+EXPORT_SYMBOL(v6wbi_flush_kern_tlb_range);
+
-diff -Nur linux-3.10.36.orig/arch/arm/kernel/fiqasm.S linux-3.10.36/arch/arm/kernel/fiqasm.S
---- linux-3.10.36.orig/arch/arm/kernel/fiqasm.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/arch/arm/kernel/fiqasm.S 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm.S
+--- linux-3.10.37/arch/arm/kernel/fiqasm.S 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/arch/arm/kernel/fiqasm.S 2014-04-24 15:35:00.749527624 +0200
@@ -25,6 +25,9 @@
ENTRY(__set_fiq_regs)
mov r2, #PSR_I_BIT | PSR_F_BIT | FIQ_MODE
@@ -1906,9 +1909,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/kernel/fiqasm.S linux-3.10.36/arch/arm/ker
+ENTRY(__FIQ_Branch)
+ mov pc, r8
+ENDPROC(__FIQ_Branch)
-diff -Nur linux-3.10.36.orig/arch/arm/kernel/fiq.c linux-3.10.36/arch/arm/kernel/fiq.c
---- linux-3.10.36.orig/arch/arm/kernel/fiq.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/arch/arm/kernel/fiq.c 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/kernel/fiq.c linux-rpi/arch/arm/kernel/fiq.c
+--- linux-3.10.37/arch/arm/kernel/fiq.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/arch/arm/kernel/fiq.c 2014-04-24 15:35:00.749527624 +0200
@@ -84,17 +84,14 @@
void set_fiq_handler(void *start, unsigned int length)
@@ -1938,9 +1941,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/kernel/fiq.c linux-3.10.36/arch/arm/kernel
EXPORT_SYMBOL(claim_fiq);
EXPORT_SYMBOL(release_fiq);
EXPORT_SYMBOL(enable_fiq);
-diff -Nur linux-3.10.36.orig/arch/arm/kernel/process.c linux-3.10.36/arch/arm/kernel/process.c
---- linux-3.10.36.orig/arch/arm/kernel/process.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/arch/arm/kernel/process.c 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/process.c
+--- linux-3.10.37/arch/arm/kernel/process.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/arch/arm/kernel/process.c 2014-04-24 15:35:00.753527668 +0200
@@ -174,7 +174,7 @@
default_idle();
}
@@ -1950,9 +1953,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/kernel/process.c linux-3.10.36/arch/arm/ke
int __init reboot_setup(char *str)
{
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.10.36/arch/arm/mach-bcm2708/armctrl.c
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/armctrl.c 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-bcm2708/armctrl.c
+--- linux-3.10.37/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
@@ -0,0 +1,219 @@
+/*
+ * linux/arch/arm/mach-bcm2708/armctrl.c
@@ -2173,9 +2176,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.10.36/arch/
+ init_FIQ(FIQ_START);
+ return 0;
+}
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.10.36/arch/arm/mach-bcm2708/armctrl.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/armctrl.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-bcm2708/armctrl.h
+--- linux-3.10.37/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
@@ -0,0 +1,27 @@
+/*
+ * linux/arch/arm/mach-bcm2708/armctrl.h
@@ -2204,9 +2207,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.10.36/arch/
+ u32 armctrl_sources, u32 resume_sources);
+
+#endif
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.10.36/arch/arm/mach-bcm2708/bcm2708.c
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/bcm2708.c 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-bcm2708/bcm2708.c
+--- linux-3.10.37/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 15:35:00.773527891 +0200
@@ -0,0 +1,1036 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708.c
@@ -3244,9 +3247,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.10.36/arch/
+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.10.36.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.10.36/arch/arm/mach-bcm2708/bcm2708_gpio.c
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/bcm2708_gpio.c 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c
+--- linux-3.10.37/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 15:35:00.773527891 +0200
@@ -0,0 +1,361 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c
@@ -3609,9 +3612,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.10.36/
+
+MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.10.36/arch/arm/mach-bcm2708/bcm2708.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/bcm2708.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-bcm2708/bcm2708.h
+--- linux-3.10.37/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 15:35:00.773527891 +0200
@@ -0,0 +1,51 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708.h
@@ -3664,9 +3667,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.10.36/arch/
+}
+
+#endif
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.c linux-3.10.36/arch/arm/mach-bcm2708/clock.c
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/clock.c 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/clock.c linux-rpi/arch/arm/mach-bcm2708/clock.c
+--- linux-3.10.37/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
@@ -0,0 +1,61 @@
+/*
+ * linux/arch/arm/mach-bcm2708/clock.c
@@ -3729,9 +3732,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.c linux-3.10.36/arch/ar
+ return -EIO;
+}
+EXPORT_SYMBOL(clk_set_rate);
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.h linux-3.10.36/arch/arm/mach-bcm2708/clock.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/clock.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/clock.h linux-rpi/arch/arm/mach-bcm2708/clock.h
+--- linux-3.10.37/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
@@ -0,0 +1,24 @@
+/*
+ * linux/arch/arm/mach-bcm2708/clock.h
@@ -3757,9 +3760,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.h linux-3.10.36/arch/ar
+struct clk {
+ unsigned long rate;
+};
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/dma.c linux-3.10.36/arch/arm/mach-bcm2708/dma.c
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/dma.c 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/dma.c linux-rpi/arch/arm/mach-bcm2708/dma.c
+--- linux-3.10.37/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
@@ -0,0 +1,407 @@
+/*
+ * linux/arch/arm/mach-bcm2708/dma.c
@@ -4168,9 +4171,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/dma.c linux-3.10.36/arch/arm/
+MODULE_LICENSE("GPL");
+
+MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM");
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/dmaer.c linux-3.10.36/arch/arm/mach-bcm2708/dmaer.c
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/dmaer.c 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/dmaer.c linux-rpi/arch/arm/mach-bcm2708/dmaer.c
+--- linux-3.10.37/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/dmaer.c 2014-04-24 15:35:00.777527936 +0200
@@ -0,0 +1,887 @@
+#include <linux/init.h>
+#include <linux/sched.h>
@@ -5059,9 +5062,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/dmaer.c linux-3.10.36/arch/ar
+module_init(dmaer_init);
+module_exit(dmaer_exit);
+
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/arm_control.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/arm_control.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h
+--- linux-3.10.37/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
@@ -0,0 +1,419 @@
+/*
+ * linux/arch/arm/mach-bcm2708/arm_control.h
@@ -5482,9 +5485,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h li
+#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c)
+
+#endif
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/arm_power.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/arm_power.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_power.h
+--- linux-3.10.37/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
@@ -0,0 +1,60 @@
+/*
+ * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h
@@ -5546,9 +5549,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linu
+};
+
+#endif
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/clkdev.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/clkdev.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h
+--- linux-3.10.37/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
@@ -0,0 +1,7 @@
+#ifndef __ASM_MACH_CLKDEV_H
+#define __ASM_MACH_CLKDEV_H
@@ -5557,9 +5560,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3
+#define __clk_put(clk) do { } while (0)
+
+#endif
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.10.36/arch/arm/mach-bcm2708/include/mach/debug-macro.S
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S
+--- linux-3.10.37/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 15:35:00.777527936 +0200
@@ -0,0 +1,22 @@
+/* arch/arm/mach-bcm2708/include/mach/debug-macro.S
+ *
@@ -5583,9 +5586,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S li
+ .endm
+
+#include <asm/hardware/debug-pl01x.S>
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/dma.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/dma.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/arm/mach-bcm2708/include/mach/dma.h
+--- linux-3.10.37/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
@@ -0,0 +1,90 @@
+/*
+ * linux/arch/arm/mach-bcm2708/include/mach/dma.h
@@ -5677,9 +5680,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.10
+
+
+#endif /* _MACH_BCM2708_DMA_H */
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.10.36/arch/arm/mach-bcm2708/include/mach/entry-macro.S
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S
+--- linux-3.10.37/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
@@ -0,0 +1,69 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/entry-macro.S
@@ -5750,9 +5753,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S li
+1020: @ EQ will be set if no irqs pending
+
+ .endm
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/frc.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/frc.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h
+--- linux-3.10.37/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
@@ -0,0 +1,38 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/timex.h
@@ -5792,9 +5795,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.10
+extern unsigned long long frc_clock_ticks63(void);
+
+#endif
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/gpio.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/gpio.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h
+--- linux-3.10.37/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 15:35:00.777527936 +0200
@@ -0,0 +1,18 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/gpio.h
@@ -5814,9 +5817,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.1
+
+#endif
+
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/hardware.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/hardware.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h
+--- linux-3.10.37/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
@@ -0,0 +1,28 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/hardware.h
@@ -5846,9 +5849,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux
+#include <mach/platform.h>
+
+#endif
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/io.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/io.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h
+--- linux-3.10.37/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
@@ -0,0 +1,27 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/io.h
@@ -5877,9 +5880,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.10.
+#define __io(a) __typesafe_io(a)
+
+#endif
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/irqs.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/irqs.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h
+--- linux-3.10.37/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 15:35:00.777527936 +0200
@@ -0,0 +1,199 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/irqs.h
@@ -6080,9 +6083,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.1
+
+
+#endif /* _BCM2708_IRQS_H_ */
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/memory.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/memory.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h
+--- linux-3.10.37/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
@@ -0,0 +1,57 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/memory.h
@@ -6141,9 +6144,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3
+#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - PLAT_PHYS_OFFSET))
+
+#endif
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/platform.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/platform.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h
+--- linux-3.10.37/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
@@ -0,0 +1,228 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/platform.h
@@ -6373,9 +6376,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux
+#endif
+
+/* END */
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/power.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/power.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/power.h
+--- linux-3.10.37/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
@@ -0,0 +1,26 @@
+/*
+ * linux/arch/arm/mach-bcm2708/power.h
@@ -6403,9 +6406,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.
+extern int bcm_power_close(BCM_POWER_HANDLE_T handle);
+
+#endif
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/system.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/system.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h
+--- linux-3.10.37/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
@@ -0,0 +1,38 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/system.h
@@ -6445,9 +6448,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3
+}
+
+#endif
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/timex.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/timex.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arch/arm/mach-bcm2708/include/mach/timex.h
+--- linux-3.10.37/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
@@ -0,0 +1,23 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/timex.h
@@ -6472,9 +6475,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.
+ */
+
+#define CLOCK_TICK_RATE (1000000)
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/uncompress.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/uncompress.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi/arch/arm/mach-bcm2708/include/mach/uncompress.h
+--- linux-3.10.37/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 15:35:00.777527936 +0200
@@ -0,0 +1,85 @@
+/*
+ * arch/arm/mach-bcn2708/include/mach/uncompress.h
@@ -6561,9 +6564,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h lin
+ */
+#define arch_decomp_wdog()
+
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vcio.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vcio.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vcio.h
+--- linux-3.10.37/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 15:35:00.777527936 +0200
@@ -0,0 +1,141 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/vcio.h
@@ -6706,9 +6709,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.1
+#define DEVICE_FILE_NAME "char_dev"
+
+#endif
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vc_mem.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_mem.h
+--- linux-3.10.37/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 15:35:00.777527936 +0200
@@ -0,0 +1,36 @@
+/*****************************************************************************
+* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved.
@@ -6746,9 +6749,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3
+
+#endif /* VC_MEM_H */
+
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vc_support.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vc_support.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_support.h
+--- linux-3.10.37/arch/arm/mach-bcm2708/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_support.h 2014-04-24 15:35:00.777527936 +0200
@@ -0,0 +1,69 @@
+#ifndef _VC_SUPPORT_H_
+#define _VC_SUPPORT_H_
@@ -6819,9 +6822,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_support.h lin
+ unsigned int r0, unsigned int r1, unsigned int r2, unsigned int r3, unsigned int r4, unsigned int r5);
+
+#endif
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vmalloc.h
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vmalloc.h
+--- linux-3.10.37/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
@@ -0,0 +1,20 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/vmalloc.h
@@ -6843,9 +6846,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#define VMALLOC_END (0xe8000000)
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/Kconfig linux-3.10.36/arch/arm/mach-bcm2708/Kconfig
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/Kconfig 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bcm2708/Kconfig
+--- linux-3.10.37/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/Kconfig 2014-04-24 15:35:00.773527891 +0200
@@ -0,0 +1,49 @@
+menu "Broadcom BCM2708 Implementations"
+ depends on ARCH_BCM2708
@@ -6896,9 +6899,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/Kconfig linux-3.10.36/arch/ar
+ Enable DMA helper for accelerating X composition
+
+endmenu
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/Makefile linux-3.10.36/arch/arm/mach-bcm2708/Makefile
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/Makefile 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-bcm2708/Makefile
+--- linux-3.10.37/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/Makefile 2014-04-24 15:35:00.773527891 +0200
@@ -0,0 +1,11 @@
+#
+# Makefile for the linux kernel.
@@ -6911,16 +6914,16 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/Makefile linux-3.10.36/arch/a
+obj-$(CONFIG_BCM2708_DMAER) += dmaer_master.o
+dmaer_master-objs := dmaer.o vc_support.o
+
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/Makefile.boot linux-3.10.36/arch/arm/mach-bcm2708/Makefile.boot
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/Makefile.boot 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/Makefile.boot linux-rpi/arch/arm/mach-bcm2708/Makefile.boot
+--- linux-3.10.37/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
@@ -0,0 +1,3 @@
+ zreladdr-y := 0x00008000
+params_phys-y := 0x00000100
+initrd_phys-y := 0x00800000
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/power.c linux-3.10.36/arch/arm/mach-bcm2708/power.c
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/power.c 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/power.c linux-rpi/arch/arm/mach-bcm2708/power.c
+--- linux-3.10.37/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
@@ -0,0 +1,194 @@
+/*
+ * linux/arch/arm/mach-bcm2708/power.c
@@ -7116,9 +7119,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/power.c linux-3.10.36/arch/ar
+MODULE_AUTHOR("Phil Elwell");
+MODULE_DESCRIPTION("Interface to BCM2708 power management");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/vcio.c linux-3.10.36/arch/arm/mach-bcm2708/vcio.c
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/vcio.c 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/vcio.c linux-rpi/arch/arm/mach-bcm2708/vcio.c
+--- linux-3.10.37/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 15:35:00.777527936 +0200
@@ -0,0 +1,474 @@
+/*
+ * linux/arch/arm/mach-bcm2708/vcio.c
@@ -7594,9 +7597,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/vcio.c linux-3.10.36/arch/arm
+MODULE_DESCRIPTION("ARM I/O to VideoCore processor");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:bcm-mbox");
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.10.36/arch/arm/mach-bcm2708/vc_mem.c
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/vc_mem.c 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/vc_mem.c linux-rpi/arch/arm/mach-bcm2708/vc_mem.c
+--- linux-3.10.37/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
@@ -0,0 +1,432 @@
+/*****************************************************************************
+* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved.
@@ -8030,9 +8033,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.10.36/arch/a
+module_param(mem_size, uint, 0644);
+module_param(mem_base, uint, 0644);
+
-diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_support.c linux-3.10.36/arch/arm/mach-bcm2708/vc_support.c
---- linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_support.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/arch/arm/mach-bcm2708/vc_support.c 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/vc_support.c linux-rpi/arch/arm/mach-bcm2708/vc_support.c
+--- linux-3.10.37/arch/arm/mach-bcm2708/vc_support.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/vc_support.c 2014-04-24 15:35:00.777527936 +0200
@@ -0,0 +1,319 @@
+/*
+ * vc_support.c
@@ -8353,9 +8356,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_support.c linux-3.10.36/ar
+ }
+}
+
-diff -Nur linux-3.10.36.orig/arch/arm/Makefile linux-3.10.36/arch/arm/Makefile
---- linux-3.10.36.orig/arch/arm/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/arch/arm/Makefile 2014-04-13 17:32:40.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/Makefile linux-rpi/arch/arm/Makefile
+--- linux-3.10.37/arch/arm/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/arch/arm/Makefile 2014-04-24 15:35:00.677526821 +0200
@@ -139,6 +139,7 @@
# by CONFIG_* macro name.
machine-$(CONFIG_ARCH_AT91) += at91
@@ -8364,9 +8367,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/Makefile linux-3.10.36/arch/arm/Makefile
machine-$(CONFIG_ARCH_BCM2835) += bcm2835
machine-$(CONFIG_ARCH_CLPS711X) += clps711x
machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx
-diff -Nur linux-3.10.36.orig/arch/arm/mm/Kconfig linux-3.10.36/arch/arm/mm/Kconfig
---- linux-3.10.36.orig/arch/arm/mm/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/arch/arm/mm/Kconfig 2014-04-13 17:32:41.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mm/Kconfig linux-rpi/arch/arm/mm/Kconfig
+--- linux-3.10.37/arch/arm/mm/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/arch/arm/mm/Kconfig 2014-04-24 15:35:00.965530031 +0200
@@ -358,7 +358,7 @@
# ARMv6
@@ -8376,9 +8379,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mm/Kconfig linux-3.10.36/arch/arm/mm/Kconf
select CPU_32v6
select CPU_ABRT_EV6
select CPU_CACHE_V6
-diff -Nur linux-3.10.36.orig/arch/arm/mm/proc-v6.S linux-3.10.36/arch/arm/mm/proc-v6.S
---- linux-3.10.36.orig/arch/arm/mm/proc-v6.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/arch/arm/mm/proc-v6.S 2014-04-13 17:32:41.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S
+--- linux-3.10.37/arch/arm/mm/proc-v6.S 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/arch/arm/mm/proc-v6.S 2014-04-24 15:35:00.969530076 +0200
@@ -73,10 +73,19 @@
*
* IRQs are already disabled.
@@ -8402,9 +8405,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mm/proc-v6.S linux-3.10.36/arch/arm/mm/pro
mov pc, lr
ENTRY(cpu_v6_dcache_clean_area)
-diff -Nur linux-3.10.36.orig/arch/arm/tools/mach-types linux-3.10.36/arch/arm/tools/mach-types
---- linux-3.10.36.orig/arch/arm/tools/mach-types 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/arch/arm/tools/mach-types 2014-04-13 17:32:41.000000000 +0200
+diff -Nur linux-3.10.37/arch/arm/tools/mach-types linux-rpi/arch/arm/tools/mach-types
+--- linux-3.10.37/arch/arm/tools/mach-types 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/arch/arm/tools/mach-types 2014-04-24 15:35:00.985530254 +0200
@@ -522,6 +522,7 @@
prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103
paz00 MACH_PAZ00 PAZ00 3128
@@ -8413,9 +8416,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/tools/mach-types linux-3.10.36/arch/arm/to
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.10.36.orig/Documentation/video4linux/bcm2835-v4l2.txt linux-3.10.36/Documentation/video4linux/bcm2835-v4l2.txt
---- linux-3.10.36.orig/Documentation/video4linux/bcm2835-v4l2.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/Documentation/video4linux/bcm2835-v4l2.txt 2014-04-13 17:32:39.000000000 +0200
+diff -Nur linux-3.10.37/Documentation/video4linux/bcm2835-v4l2.txt linux-rpi/Documentation/video4linux/bcm2835-v4l2.txt
+--- linux-3.10.37/Documentation/video4linux/bcm2835-v4l2.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/Documentation/video4linux/bcm2835-v4l2.txt 2014-04-24 15:35:00.565525573 +0200
@@ -0,0 +1,60 @@
+
+BCM2835 (aka Raspberry Pi) V4L2 driver
@@ -8477,9 +8480,9 @@ diff -Nur linux-3.10.36.orig/Documentation/video4linux/bcm2835-v4l2.txt linux-3.
+List of available formats:
+
+$ v4l2-ctl --list-formats
-diff -Nur linux-3.10.36.orig/drivers/char/broadcom/Kconfig linux-3.10.36/drivers/char/broadcom/Kconfig
---- linux-3.10.36.orig/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/char/broadcom/Kconfig 2014-04-13 17:32:54.000000000 +0200
+diff -Nur linux-3.10.37/drivers/char/broadcom/Kconfig linux-rpi/drivers/char/broadcom/Kconfig
+--- linux-3.10.37/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/char/broadcom/Kconfig 2014-04-24 15:35:02.101542691 +0200
@@ -0,0 +1,16 @@
+#
+# Broadcom char driver config
@@ -8497,15 +8500,15 @@ diff -Nur linux-3.10.36.orig/drivers/char/broadcom/Kconfig linux-3.10.36/drivers
+ help
+ Helper for videocore CMA access.
+
-diff -Nur linux-3.10.36.orig/drivers/char/broadcom/Makefile linux-3.10.36/drivers/char/broadcom/Makefile
---- linux-3.10.36.orig/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/char/broadcom/Makefile 2014-04-13 17:32:54.000000000 +0200
+diff -Nur linux-3.10.37/drivers/char/broadcom/Makefile linux-rpi/drivers/char/broadcom/Makefile
+--- linux-3.10.37/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/char/broadcom/Makefile 2014-04-24 15:35:02.101542691 +0200
@@ -0,0 +1,2 @@
+obj-$(CONFIG_BCM_VC_CMA) += vc_cma/
+
-diff -Nur linux-3.10.36.orig/drivers/char/broadcom/vc_cma/Makefile linux-3.10.36/drivers/char/broadcom/vc_cma/Makefile
---- linux-3.10.36.orig/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/char/broadcom/vc_cma/Makefile 2014-04-13 17:32:54.000000000 +0200
+diff -Nur linux-3.10.37/drivers/char/broadcom/vc_cma/Makefile linux-rpi/drivers/char/broadcom/vc_cma/Makefile
+--- linux-3.10.37/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/char/broadcom/vc_cma/Makefile 2014-04-24 15:35:02.101542691 +0200
@@ -0,0 +1,14 @@
+ccflags-y += -Wall -Wstrict-prototypes -Wno-trigraphs
+ccflags-y += -Werror
@@ -8521,9 +8524,9 @@ diff -Nur linux-3.10.36.orig/drivers/char/broadcom/vc_cma/Makefile linux-3.10.36
+
+vc-cma-objs := vc_cma.o
+
-diff -Nur linux-3.10.36.orig/drivers/char/broadcom/vc_cma/vc_cma.c linux-3.10.36/drivers/char/broadcom/vc_cma/vc_cma.c
---- linux-3.10.36.orig/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/char/broadcom/vc_cma/vc_cma.c 2014-04-13 17:32:54.000000000 +0200
+diff -Nur linux-3.10.37/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi/drivers/char/broadcom/vc_cma/vc_cma.c
+--- linux-3.10.37/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/char/broadcom/vc_cma/vc_cma.c 2014-04-24 15:35:02.101542691 +0200
@@ -0,0 +1,1143 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -9668,9 +9671,9 @@ diff -Nur linux-3.10.36.orig/drivers/char/broadcom/vc_cma/vc_cma.c linux-3.10.36
+module_exit(vc_cma_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Broadcom Corporation");
-diff -Nur linux-3.10.36.orig/drivers/char/hw_random/bcm2708-rng.c linux-3.10.36/drivers/char/hw_random/bcm2708-rng.c
---- linux-3.10.36.orig/drivers/char/hw_random/bcm2708-rng.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/char/hw_random/bcm2708-rng.c 2014-04-13 17:32:54.000000000 +0200
+diff -Nur linux-3.10.37/drivers/char/hw_random/bcm2708-rng.c linux-rpi/drivers/char/hw_random/bcm2708-rng.c
+--- linux-3.10.37/drivers/char/hw_random/bcm2708-rng.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/char/hw_random/bcm2708-rng.c 2014-04-24 15:35:02.101542691 +0200
@@ -0,0 +1,117 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -9789,9 +9792,9 @@ diff -Nur linux-3.10.36.orig/drivers/char/hw_random/bcm2708-rng.c linux-3.10.36/
+
+MODULE_DESCRIPTION("BCM2708 H/W Random Number Generator (RNG) driver");
+MODULE_LICENSE("GPL and additional rights");
-diff -Nur linux-3.10.36.orig/drivers/char/hw_random/Kconfig linux-3.10.36/drivers/char/hw_random/Kconfig
---- linux-3.10.36.orig/drivers/char/hw_random/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/char/hw_random/Kconfig 2014-04-13 17:32:54.000000000 +0200
+diff -Nur linux-3.10.37/drivers/char/hw_random/Kconfig linux-rpi/drivers/char/hw_random/Kconfig
+--- linux-3.10.37/drivers/char/hw_random/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/char/hw_random/Kconfig 2014-04-24 15:35:02.101542691 +0200
@@ -314,3 +314,15 @@
module will be called tpm-rng.
@@ -9808,17 +9811,17 @@ diff -Nur linux-3.10.36.orig/drivers/char/hw_random/Kconfig linux-3.10.36/driver
+
+ If unsure, say N.
+
-diff -Nur linux-3.10.36.orig/drivers/char/hw_random/Makefile linux-3.10.36/drivers/char/hw_random/Makefile
---- linux-3.10.36.orig/drivers/char/hw_random/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/char/hw_random/Makefile 2014-04-13 17:32:54.000000000 +0200
+diff -Nur linux-3.10.37/drivers/char/hw_random/Makefile linux-rpi/drivers/char/hw_random/Makefile
+--- linux-3.10.37/drivers/char/hw_random/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/char/hw_random/Makefile 2014-04-24 15:35:02.101542691 +0200
@@ -27,3 +27,4 @@
obj-$(CONFIG_HW_RANDOM_EXYNOS) += exynos-rng.o
obj-$(CONFIG_HW_RANDOM_TPM) += tpm-rng.o
obj-$(CONFIG_HW_RANDOM_BCM2835) += bcm2835-rng.o
+obj-$(CONFIG_HW_RANDOM_BCM2708) += bcm2708-rng.o
-diff -Nur linux-3.10.36.orig/drivers/char/Kconfig linux-3.10.36/drivers/char/Kconfig
---- linux-3.10.36.orig/drivers/char/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/char/Kconfig 2014-04-13 17:32:54.000000000 +0200
+diff -Nur linux-3.10.37/drivers/char/Kconfig linux-rpi/drivers/char/Kconfig
+--- linux-3.10.37/drivers/char/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/char/Kconfig 2014-04-24 15:35:02.093542602 +0200
@@ -586,6 +586,8 @@
source "drivers/s390/char/Kconfig"
@@ -9828,9 +9831,9 @@ diff -Nur linux-3.10.36.orig/drivers/char/Kconfig linux-3.10.36/drivers/char/Kco
config MSM_SMD_PKT
bool "Enable device interface for some SMD packet ports"
default n
-diff -Nur linux-3.10.36.orig/drivers/char/Makefile linux-3.10.36/drivers/char/Makefile
---- linux-3.10.36.orig/drivers/char/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/char/Makefile 2014-04-13 17:32:54.000000000 +0200
+diff -Nur linux-3.10.37/drivers/char/Makefile linux-rpi/drivers/char/Makefile
+--- linux-3.10.37/drivers/char/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/char/Makefile 2014-04-24 15:35:02.093542602 +0200
@@ -62,3 +62,6 @@
js-rtc-y = rtc.o
@@ -9838,9 +9841,9 @@ diff -Nur linux-3.10.36.orig/drivers/char/Makefile linux-3.10.36/drivers/char/Ma
+
+obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/
+
-diff -Nur linux-3.10.36.orig/drivers/cpufreq/bcm2835-cpufreq.c linux-3.10.36/drivers/cpufreq/bcm2835-cpufreq.c
---- linux-3.10.36.orig/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/cpufreq/bcm2835-cpufreq.c 2014-04-13 17:32:55.000000000 +0200
+diff -Nur linux-3.10.37/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi/drivers/cpufreq/bcm2835-cpufreq.c
+--- linux-3.10.37/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/cpufreq/bcm2835-cpufreq.c 2014-04-24 15:35:02.129543003 +0200
@@ -0,0 +1,239 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -10081,9 +10084,9 @@ diff -Nur linux-3.10.36.orig/drivers/cpufreq/bcm2835-cpufreq.c linux-3.10.36/dri
+module_init(bcm2835_cpufreq_module_init);
+module_exit(bcm2835_cpufreq_module_exit);
+
-diff -Nur linux-3.10.36.orig/drivers/cpufreq/Kconfig.arm linux-3.10.36/drivers/cpufreq/Kconfig.arm
---- linux-3.10.36.orig/drivers/cpufreq/Kconfig.arm 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/cpufreq/Kconfig.arm 2014-04-13 17:32:55.000000000 +0200
+diff -Nur linux-3.10.37/drivers/cpufreq/Kconfig.arm linux-rpi/drivers/cpufreq/Kconfig.arm
+--- linux-3.10.37/drivers/cpufreq/Kconfig.arm 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/cpufreq/Kconfig.arm 2014-04-24 15:35:02.129543003 +0200
@@ -150,3 +150,11 @@
default y
help
@@ -10096,9 +10099,9 @@ diff -Nur linux-3.10.36.orig/drivers/cpufreq/Kconfig.arm linux-3.10.36/drivers/c
+ This adds the CPUFreq driver for BCM2835
+
+ If in doubt, say N.
-diff -Nur linux-3.10.36.orig/drivers/cpufreq/Makefile linux-3.10.36/drivers/cpufreq/Makefile
---- linux-3.10.36.orig/drivers/cpufreq/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/cpufreq/Makefile 2014-04-13 17:32:55.000000000 +0200
+diff -Nur linux-3.10.37/drivers/cpufreq/Makefile linux-rpi/drivers/cpufreq/Makefile
+--- linux-3.10.37/drivers/cpufreq/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/cpufreq/Makefile 2014-04-24 15:35:02.129543003 +0200
@@ -72,6 +72,7 @@
obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o
obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o
@@ -10107,9 +10110,9 @@ diff -Nur linux-3.10.36.orig/drivers/cpufreq/Makefile linux-3.10.36/drivers/cpuf
##################################################################################
# PowerPC platform drivers
-diff -Nur linux-3.10.36.orig/drivers/dma/bcm2708-dmaengine.c linux-3.10.36/drivers/dma/bcm2708-dmaengine.c
---- linux-3.10.36.orig/drivers/dma/bcm2708-dmaengine.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/dma/bcm2708-dmaengine.c 2014-04-13 17:32:55.000000000 +0200
+diff -Nur linux-3.10.37/drivers/dma/bcm2708-dmaengine.c linux-rpi/drivers/dma/bcm2708-dmaengine.c
+--- linux-3.10.37/drivers/dma/bcm2708-dmaengine.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/dma/bcm2708-dmaengine.c 2014-04-24 15:35:02.153543270 +0200
@@ -0,0 +1,588 @@
+/*
+ * BCM2708 DMA engine support
@@ -10699,9 +10702,9 @@ diff -Nur linux-3.10.36.orig/drivers/dma/bcm2708-dmaengine.c linux-3.10.36/drive
+MODULE_DESCRIPTION("BCM2708 DMA engine driver");
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36.orig/drivers/dma/Kconfig linux-3.10.36/drivers/dma/Kconfig
---- linux-3.10.36.orig/drivers/dma/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/dma/Kconfig 2014-04-13 17:32:55.000000000 +0200
+diff -Nur linux-3.10.37/drivers/dma/Kconfig linux-rpi/drivers/dma/Kconfig
+--- linux-3.10.37/drivers/dma/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/dma/Kconfig 2014-04-24 15:35:02.153543270 +0200
@@ -305,6 +305,12 @@
select DMA_ENGINE
select DMA_VIRTUAL_CHANNELS
@@ -10715,18 +10718,18 @@ diff -Nur linux-3.10.36.orig/drivers/dma/Kconfig linux-3.10.36/drivers/dma/Kconf
config MMP_PDMA
bool "MMP PDMA support"
depends on (ARCH_MMP || ARCH_PXA)
-diff -Nur linux-3.10.36.orig/drivers/dma/Makefile linux-3.10.36/drivers/dma/Makefile
---- linux-3.10.36.orig/drivers/dma/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/dma/Makefile 2014-04-13 17:32:55.000000000 +0200
+diff -Nur linux-3.10.37/drivers/dma/Makefile linux-rpi/drivers/dma/Makefile
+--- linux-3.10.37/drivers/dma/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/dma/Makefile 2014-04-24 15:35:02.153543270 +0200
@@ -37,4 +37,5 @@
obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o
obj-$(CONFIG_MMP_TDMA) += mmp_tdma.o
obj-$(CONFIG_DMA_OMAP) += omap-dma.o
+obj-$(CONFIG_DMA_BCM2708) += bcm2708-dmaengine.o
obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o
-diff -Nur linux-3.10.36.orig/drivers/hwmon/bcm2835-hwmon.c linux-3.10.36/drivers/hwmon/bcm2835-hwmon.c
---- linux-3.10.36.orig/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/hwmon/bcm2835-hwmon.c 2014-04-13 17:32:56.000000000 +0200
+diff -Nur linux-3.10.37/drivers/hwmon/bcm2835-hwmon.c linux-rpi/drivers/hwmon/bcm2835-hwmon.c
+--- linux-3.10.37/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/hwmon/bcm2835-hwmon.c 2014-04-24 15:35:02.349545454 +0200
@@ -0,0 +1,219 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -10947,9 +10950,9 @@ diff -Nur linux-3.10.36.orig/drivers/hwmon/bcm2835-hwmon.c linux-3.10.36/drivers
+MODULE_DESCRIPTION("HW Monitor driver for bcm2835 chip");
+
+module_platform_driver(bcm2835_hwmon_driver);
-diff -Nur linux-3.10.36.orig/drivers/hwmon/Kconfig linux-3.10.36/drivers/hwmon/Kconfig
---- linux-3.10.36.orig/drivers/hwmon/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/hwmon/Kconfig 2014-04-13 17:32:56.000000000 +0200
+diff -Nur linux-3.10.37/drivers/hwmon/Kconfig linux-rpi/drivers/hwmon/Kconfig
+--- linux-3.10.37/drivers/hwmon/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/hwmon/Kconfig 2014-04-24 15:35:02.345545410 +0200
@@ -1528,6 +1528,16 @@
help
Support for the A/D converter on MC13783 and MC13892 PMIC.
@@ -10967,9 +10970,9 @@ diff -Nur linux-3.10.36.orig/drivers/hwmon/Kconfig linux-3.10.36/drivers/hwmon/K
if ACPI
comment "ACPI drivers"
-diff -Nur linux-3.10.36.orig/drivers/hwmon/Makefile linux-3.10.36/drivers/hwmon/Makefile
---- linux-3.10.36.orig/drivers/hwmon/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/hwmon/Makefile 2014-04-13 17:32:56.000000000 +0200
+diff -Nur linux-3.10.37/drivers/hwmon/Makefile linux-rpi/drivers/hwmon/Makefile
+--- linux-3.10.37/drivers/hwmon/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/hwmon/Makefile 2014-04-24 15:35:02.345545410 +0200
@@ -140,6 +140,7 @@
obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o
obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
@@ -10978,9 +10981,9 @@ diff -Nur linux-3.10.36.orig/drivers/hwmon/Makefile linux-3.10.36/drivers/hwmon/
obj-$(CONFIG_PMBUS) += pmbus/
-diff -Nur linux-3.10.36.orig/drivers/i2c/busses/i2c-bcm2708.c linux-3.10.36/drivers/i2c/busses/i2c-bcm2708.c
---- linux-3.10.36.orig/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/i2c/busses/i2c-bcm2708.c 2014-04-13 17:32:56.000000000 +0200
+diff -Nur linux-3.10.37/drivers/i2c/busses/i2c-bcm2708.c linux-rpi/drivers/i2c/busses/i2c-bcm2708.c
+--- linux-3.10.37/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/i2c/busses/i2c-bcm2708.c 2014-04-24 15:35:02.373545722 +0200
@@ -0,0 +1,419 @@
+/*
+ * Driver for Broadcom BCM2708 BSC Controllers
@@ -11401,9 +11404,9 @@ diff -Nur linux-3.10.36.orig/drivers/i2c/busses/i2c-bcm2708.c linux-3.10.36/driv
+MODULE_AUTHOR("Chris Boot <bootc@bootc.net>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
-diff -Nur linux-3.10.36.orig/drivers/i2c/busses/Kconfig linux-3.10.36/drivers/i2c/busses/Kconfig
---- linux-3.10.36.orig/drivers/i2c/busses/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/i2c/busses/Kconfig 2014-04-13 17:32:56.000000000 +0200
+diff -Nur linux-3.10.37/drivers/i2c/busses/Kconfig linux-rpi/drivers/i2c/busses/Kconfig
+--- linux-3.10.37/drivers/i2c/busses/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/i2c/busses/Kconfig 2014-04-24 15:35:02.373545722 +0200
@@ -345,6 +345,25 @@
This support is also available as a module. If so, the module
will be called i2c-bcm2835.
@@ -11430,9 +11433,9 @@ diff -Nur linux-3.10.36.orig/drivers/i2c/busses/Kconfig linux-3.10.36/drivers/i2
config I2C_BLACKFIN_TWI
tristate "Blackfin TWI I2C support"
depends on BLACKFIN
-diff -Nur linux-3.10.36.orig/drivers/i2c/busses/Makefile linux-3.10.36/drivers/i2c/busses/Makefile
---- linux-3.10.36.orig/drivers/i2c/busses/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/i2c/busses/Makefile 2014-04-13 17:32:56.000000000 +0200
+diff -Nur linux-3.10.37/drivers/i2c/busses/Makefile linux-rpi/drivers/i2c/busses/Makefile
+--- linux-3.10.37/drivers/i2c/busses/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/i2c/busses/Makefile 2014-04-24 15:35:02.373545722 +0200
@@ -32,6 +32,7 @@
obj-$(CONFIG_I2C_AT91) += i2c-at91.o
obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o
@@ -11441,9 +11444,9 @@ diff -Nur linux-3.10.36.orig/drivers/i2c/busses/Makefile linux-3.10.36/drivers/i
obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bfin-twi.o
obj-$(CONFIG_I2C_CBUS_GPIO) += i2c-cbus-gpio.o
obj-$(CONFIG_I2C_CPM) += i2c-cpm.o
-diff -Nur linux-3.10.36.orig/drivers/media/dvb-core/dvb-usb-ids.h linux-3.10.36/drivers/media/dvb-core/dvb-usb-ids.h
---- linux-3.10.36.orig/drivers/media/dvb-core/dvb-usb-ids.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/media/dvb-core/dvb-usb-ids.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/dvb-core/dvb-usb-ids.h linux-rpi/drivers/media/dvb-core/dvb-usb-ids.h
+--- linux-3.10.37/drivers/media/dvb-core/dvb-usb-ids.h 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/media/dvb-core/dvb-usb-ids.h 2014-04-24 15:35:02.601548262 +0200
@@ -365,6 +365,7 @@
#define USB_PID_TERRATEC_DVBS2CI_V2 0x10ac
#define USB_PID_TECHNISAT_USB2_HDCI_V1 0x0001
@@ -11452,9 +11455,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/dvb-core/dvb-usb-ids.h linux-3.10.36/
#define USB_PID_TECHNISAT_AIRSTAR_TELESTICK_2 0x0004
#define USB_PID_TECHNISAT_USB2_DVB_S2 0x0500
#endif
-diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/bcm2835-camera.c linux-3.10.36/drivers/media/platform/bcm2835/bcm2835-camera.c
---- linux-3.10.36.orig/drivers/media/platform/bcm2835/bcm2835-camera.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/media/platform/bcm2835/bcm2835-camera.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/bcm2835/bcm2835-camera.c linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.c
+--- linux-3.10.37/drivers/media/platform/bcm2835/bcm2835-camera.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.c 2014-04-24 15:35:02.713549510 +0200
@@ -0,0 +1,1722 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -13178,9 +13181,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/bcm2835-camera.c lin
+
+module_init(bm2835_mmal_init);
+module_exit(bm2835_mmal_exit);
-diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/bcm2835-camera.h linux-3.10.36/drivers/media/platform/bcm2835/bcm2835-camera.h
---- linux-3.10.36.orig/drivers/media/platform/bcm2835/bcm2835-camera.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/media/platform/bcm2835/bcm2835-camera.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/bcm2835/bcm2835-camera.h linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.h
+--- linux-3.10.37/drivers/media/platform/bcm2835/bcm2835-camera.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.h 2014-04-24 15:35:02.713549510 +0200
@@ -0,0 +1,125 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -13307,9 +13310,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/bcm2835-camera.h lin
+ (pix_fmt)->pixelformat, (pix_fmt)->bytesperline, \
+ (pix_fmt)->sizeimage, (pix_fmt)->colorspace, (pix_fmt)->priv); \
+}
-diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/controls.c linux-3.10.36/drivers/media/platform/bcm2835/controls.c
---- linux-3.10.36.orig/drivers/media/platform/bcm2835/controls.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/media/platform/bcm2835/controls.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/bcm2835/controls.c linux-rpi/drivers/media/platform/bcm2835/controls.c
+--- linux-3.10.37/drivers/media/platform/bcm2835/controls.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/controls.c 2014-04-24 15:35:02.713549510 +0200
@@ -0,0 +1,1315 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -14626,9 +14629,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/controls.c linux-3.1
+
+ return 0;
+}
-diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/Kconfig linux-3.10.36/drivers/media/platform/bcm2835/Kconfig
---- linux-3.10.36.orig/drivers/media/platform/bcm2835/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/media/platform/bcm2835/Kconfig 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/bcm2835/Kconfig linux-rpi/drivers/media/platform/bcm2835/Kconfig
+--- linux-3.10.37/drivers/media/platform/bcm2835/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/Kconfig 2014-04-24 15:35:02.713549510 +0200
@@ -0,0 +1,25 @@
+# Broadcom VideoCore IV v4l2 camera support
+
@@ -14655,18 +14658,18 @@ diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/Kconfig linux-3.10.3
+
+
+endif # VIDEO_BM2835
-diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/Makefile linux-3.10.36/drivers/media/platform/bcm2835/Makefile
---- linux-3.10.36.orig/drivers/media/platform/bcm2835/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/media/platform/bcm2835/Makefile 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/bcm2835/Makefile linux-rpi/drivers/media/platform/bcm2835/Makefile
+--- linux-3.10.37/drivers/media/platform/bcm2835/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/Makefile 2014-04-24 15:35:02.713549510 +0200
@@ -0,0 +1,5 @@
+bcm2835-v4l2-objs := bcm2835-camera.o controls.o mmal-vchiq.o
+
+obj-$(CONFIG_VIDEO_BCM2835_MMAL) += bcm2835-v4l2.o
+
+ccflags-$(CONFIG_VIDEO_BCM2835) += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000
-diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-common.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-common.h
---- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-common.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-common.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/bcm2835/mmal-common.h linux-rpi/drivers/media/platform/bcm2835/mmal-common.h
+--- linux-3.10.37/drivers/media/platform/bcm2835/mmal-common.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-common.h 2014-04-24 15:35:02.713549510 +0200
@@ -0,0 +1,53 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -14721,9 +14724,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-common.h linux-
+ u32 v;
+};
+
-diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-encodings.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-encodings.h
---- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-encodings.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-encodings.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/bcm2835/mmal-encodings.h linux-rpi/drivers/media/platform/bcm2835/mmal-encodings.h
+--- linux-3.10.37/drivers/media/platform/bcm2835/mmal-encodings.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-encodings.h 2014-04-24 15:35:02.713549510 +0200
@@ -0,0 +1,94 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -14819,9 +14822,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-encodings.h lin
+#define MMAL_ENCODING_VARIANT_H264_AVC1 MMAL_FOURCC('A', 'V', 'C', '1')
+/** Implicitly delineated NAL units without emulation prevention */
+#define MMAL_ENCODING_VARIANT_H264_RAW MMAL_FOURCC('R', 'A', 'W', ' ')
-diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg-common.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg-common.h
---- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg-common.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg-common.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/bcm2835/mmal-msg-common.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-common.h
+--- linux-3.10.37/drivers/media/platform/bcm2835/mmal-msg-common.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg-common.h 2014-04-24 15:35:02.713549510 +0200
@@ -0,0 +1,50 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -14873,9 +14876,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg-common.h li
+};
+
+#endif /* MMAL_MSG_COMMON_H */
-diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg-format.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg-format.h
---- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg-format.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg-format.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/bcm2835/mmal-msg-format.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-format.h
+--- linux-3.10.37/drivers/media/platform/bcm2835/mmal-msg-format.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg-format.h 2014-04-24 15:35:02.713549510 +0200
@@ -0,0 +1,81 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -14958,9 +14961,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg-format.h li
+};
+
+#endif /* MMAL_MSG_FORMAT_H */
-diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg.h
---- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/bcm2835/mmal-msg.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg.h
+--- linux-3.10.37/drivers/media/platform/bcm2835/mmal-msg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg.h 2014-04-24 15:35:02.713549510 +0200
@@ -0,0 +1,404 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -15366,9 +15369,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg.h linux-3.1
+ u8 payload[MMAL_MSG_MAX_PAYLOAD];
+ } u;
+};
-diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg-port.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg-port.h
---- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg-port.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg-port.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/bcm2835/mmal-msg-port.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-port.h
+--- linux-3.10.37/drivers/media/platform/bcm2835/mmal-msg-port.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg-port.h 2014-04-24 15:35:02.713549510 +0200
@@ -0,0 +1,107 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -15477,9 +15480,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg-port.h linu
+ */
+
+};
-diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-parameters.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-parameters.h
---- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-parameters.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-parameters.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/bcm2835/mmal-parameters.h linux-rpi/drivers/media/platform/bcm2835/mmal-parameters.h
+--- linux-3.10.37/drivers/media/platform/bcm2835/mmal-parameters.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-parameters.h 2014-04-24 15:35:02.713549510 +0200
@@ -0,0 +1,655 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -16136,9 +16139,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-parameters.h li
+ u32 num_effect_params;
+ u32 effect_parameter[MMAL_MAX_IMAGEFX_PARAMETERS];
+};
-diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-vchiq.c linux-3.10.36/drivers/media/platform/bcm2835/mmal-vchiq.c
---- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-vchiq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-vchiq.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/bcm2835/mmal-vchiq.c linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.c
+--- linux-3.10.37/drivers/media/platform/bcm2835/mmal-vchiq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.c 2014-04-24 15:35:02.713549510 +0200
@@ -0,0 +1,1916 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -18056,9 +18059,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-vchiq.c linux-3
+ kfree(instance);
+ return -ENODEV;
+}
-diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-vchiq.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-vchiq.h
---- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-vchiq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-vchiq.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/bcm2835/mmal-vchiq.h linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.h
+--- linux-3.10.37/drivers/media/platform/bcm2835/mmal-vchiq.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.h 2014-04-24 15:35:02.713549510 +0200
@@ -0,0 +1,178 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -18238,9 +18241,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-vchiq.h linux-3
+ struct mmal_buffer *buf);
+
+#endif /* MMAL_VCHIQ_H */
-diff -Nur linux-3.10.36.orig/drivers/media/platform/Kconfig linux-3.10.36/drivers/media/platform/Kconfig
---- linux-3.10.36.orig/drivers/media/platform/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/media/platform/Kconfig 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/Kconfig linux-rpi/drivers/media/platform/Kconfig
+--- linux-3.10.37/drivers/media/platform/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/media/platform/Kconfig 2014-04-24 15:35:02.713549510 +0200
@@ -124,6 +124,7 @@
source "drivers/media/platform/soc_camera/Kconfig"
source "drivers/media/platform/exynos4-is/Kconfig"
@@ -18249,9 +18252,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/platform/Kconfig linux-3.10.36/driver
endif # V4L_PLATFORM_DRIVERS
-diff -Nur linux-3.10.36.orig/drivers/media/platform/Makefile linux-3.10.36/drivers/media/platform/Makefile
---- linux-3.10.36.orig/drivers/media/platform/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/media/platform/Makefile 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/platform/Makefile linux-rpi/drivers/media/platform/Makefile
+--- linux-3.10.37/drivers/media/platform/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/media/platform/Makefile 2014-04-24 15:35:02.713549510 +0200
@@ -50,4 +50,6 @@
obj-$(CONFIG_ARCH_OMAP) += omap/
@@ -18259,9 +18262,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/platform/Makefile linux-3.10.36/drive
+obj-$(CONFIG_VIDEO_BCM2835) += bcm2835/
+
ccflags-y += -I$(srctree)/drivers/media/i2c
-diff -Nur linux-3.10.36.orig/drivers/media/usb/dvb-usb-v2/az6007.c linux-3.10.36/drivers/media/usb/dvb-usb-v2/az6007.c
---- linux-3.10.36.orig/drivers/media/usb/dvb-usb-v2/az6007.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/media/usb/dvb-usb-v2/az6007.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/usb/dvb-usb-v2/az6007.c linux-rpi/drivers/media/usb/dvb-usb-v2/az6007.c
+--- linux-3.10.37/drivers/media/usb/dvb-usb-v2/az6007.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/media/usb/dvb-usb-v2/az6007.c 2014-04-24 15:35:02.781550268 +0200
@@ -68,6 +68,19 @@
.microcode_name = "dvb-usb-terratec-h7-drxk.fw",
};
@@ -18349,9 +18352,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/usb/dvb-usb-v2/az6007.c linux-3.10.36
{0},
};
-diff -Nur linux-3.10.36.orig/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-3.10.36/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
---- linux-3.10.36.orig/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-rpi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+--- linux-3.10.37/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2014-04-24 15:35:02.785550313 +0200
@@ -1408,6 +1408,10 @@
&rtl2832u_props, "Compro VideoMate U620F", NULL) },
{ DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394,
@@ -18363,9 +18366,9 @@ diff -Nur linux-3.10.36.orig/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-3.10.
{ }
};
MODULE_DEVICE_TABLE(usb, rtl28xxu_id_table);
-diff -Nur linux-3.10.36.orig/drivers/misc/Kconfig linux-3.10.36/drivers/misc/Kconfig
---- linux-3.10.36.orig/drivers/misc/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/misc/Kconfig 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/Kconfig linux-rpi/drivers/misc/Kconfig
+--- linux-3.10.37/drivers/misc/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/misc/Kconfig 2014-04-24 15:35:02.873551293 +0200
@@ -536,4 +536,6 @@
source "drivers/misc/altera-stapl/Kconfig"
source "drivers/misc/mei/Kconfig"
@@ -18373,17 +18376,17 @@ diff -Nur linux-3.10.36.orig/drivers/misc/Kconfig linux-3.10.36/drivers/misc/Kco
+source "drivers/misc/vc04_services/Kconfig"
endmenu
+
-diff -Nur linux-3.10.36.orig/drivers/misc/Makefile linux-3.10.36/drivers/misc/Makefile
---- linux-3.10.36.orig/drivers/misc/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/misc/Makefile 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/Makefile linux-rpi/drivers/misc/Makefile
+--- linux-3.10.37/drivers/misc/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/misc/Makefile 2014-04-24 15:35:02.873551293 +0200
@@ -53,3 +53,4 @@
obj-$(CONFIG_VMWARE_VMCI) += vmw_vmci/
obj-$(CONFIG_LATTICE_ECP3_CONFIG) += lattice-ecp3-config.o
obj-$(CONFIG_SRAM) += sram.o
+obj-$(CONFIG_BCM2708_VCHIQ) += vc04_services/
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-3.10.36/drivers/misc/vc04_services/interface/vchi/connections/connection.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi/drivers/misc/vc04_services/interface/vchi/connections/connection.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2014-04-24 15:35:02.889551471 +0200
@@ -0,0 +1,328 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -18713,9 +18716,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/connectio
+#endif /* CONNECTION_H_ */
+
+/****************************** End of file **********************************/
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-3.10.36/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-rpi/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2014-04-24 15:35:02.889551471 +0200
@@ -0,0 +1,204 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -18921,9 +18924,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/message_d
+#endif // _VCHI_MESSAGE_H_
+
+/****************************** End of file ***********************************/
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2014-04-24 15:35:02.889551471 +0200
@@ -0,0 +1,224 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -19149,9 +19152,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg.
+#endif /* VCHI_CFG_H_ */
+
+/****************************** End of file **********************************/
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2014-04-24 15:35:02.889551471 +0200
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -19224,9 +19227,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg_
+//#define VCHI_RX_NANOLOCKS
+
+#endif /*VCHI_CFG_INTERNAL_H_*/
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_common.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_common.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2014-04-24 15:35:02.889551471 +0200
@@ -0,0 +1,163 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -19391,9 +19394,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_comm
+
+
+#endif // VCHI_COMMON_H_
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi.h 2014-04-24 15:35:02.889551471 +0200
@@ -0,0 +1,373 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -19768,9 +19771,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi.h li
+#endif /* VCHI_H_ */
+
+/****************************** End of file **********************************/
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_mh.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_mh.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -19814,9 +19817,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_mh.h
+#define VCHI_MEM_HANDLE_INVALID 0
+
+#endif
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,561 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -20379,9 +20382,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+
+ kfree(pagelist);
+}
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -20425,9 +20428,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+#define VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX 1
+
+#endif /* VCHIQ_2835_H */
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,2813 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -23242,9 +23245,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+module_exit(vchiq_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Broadcom Corporation");
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,212 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -23458,9 +23461,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+
+
+#endif /* VCHIQ_ARM_H */
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -23499,9 +23502,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+const char *vchiq_get_build_version(void);
+const char *vchiq_get_build_time(void);
+const char *vchiq_get_build_date(void);
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -23563,9 +23566,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+#endif
+
+#endif /* VCHIQ_CFG_H */
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,119 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -23686,9 +23689,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+ mutex_unlock(&g_connected_mutex);
+}
+EXPORT_SYMBOL(vchiq_add_connected_callback);
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -23741,9 +23744,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+
+#endif /* VCHIQ_CONNECTED_H */
+
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,3824 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -27569,9 +27572,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+ numBytes = 0;
+ }
+}
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,706 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -28279,9 +28282,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+ size_t numBytes);
+
+#endif
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,89 @@
+#!/usr/bin/perl -w
+
@@ -28372,9 +28375,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+EOF
+
+
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -28417,9 +28420,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+
+#endif
+
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,188 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -28609,9 +28612,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+ short *peer_version);
+
+#endif /* VCHIQ_IF_H */
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,129 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -28742,9 +28745,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+#define VCHIQ_IOC_MAX 15
+
+#endif
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,456 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -29202,9 +29205,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+
+ return status;
+}
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -29277,9 +29280,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+ const VCHIQ_PLATFORM_DATA_T * platform_data);
+
+#endif
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -29339,9 +29342,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+} FRAGMENTS_T;
+
+#endif /* VCHIQ_PAGELIST_H */
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,254 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -29597,9 +29600,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+
+#endif
+
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,828 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -30429,9 +30432,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+ return ret;
+}
+EXPORT_SYMBOL(vchi_service_release);
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,151 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -30584,9 +30587,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+
+ return header;
+}
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,82 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -30670,9 +30673,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+
+#endif
+
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c
---- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c
+--- linux-3.10.37/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2014-04-24 15:35:02.893551516 +0200
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -30733,9 +30736,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchi
+{
+ return vchiq_build_time;
+}
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/Kconfig linux-3.10.36/drivers/misc/vc04_services/Kconfig
---- linux-3.10.36.orig/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/Kconfig 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/Kconfig linux-rpi/drivers/misc/vc04_services/Kconfig
+--- linux-3.10.37/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/Kconfig 2014-04-24 15:35:02.889551471 +0200
@@ -0,0 +1,10 @@
+config BCM2708_VCHIQ
+ tristate "Videocore VCHIQ"
@@ -30747,9 +30750,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/Kconfig linux-3.10.36/dr
+ Defaults to Y when the Broadcom Videocore services
+ are included in the build, N otherwise.
+
-diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/Makefile linux-3.10.36/drivers/misc/vc04_services/Makefile
---- linux-3.10.36.orig/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/misc/vc04_services/Makefile 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/misc/vc04_services/Makefile linux-rpi/drivers/misc/vc04_services/Makefile
+--- linux-3.10.37/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/Makefile 2014-04-24 15:35:02.889551471 +0200
@@ -0,0 +1,18 @@
+ifeq ($(CONFIG_MACH_BCM2708),y)
+
@@ -30769,9 +30772,9 @@ diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/Makefile linux-3.10.36/d
+
+endif
+
-diff -Nur linux-3.10.36.orig/drivers/mmc/card/block.c linux-3.10.36/drivers/mmc/card/block.c
---- linux-3.10.36.orig/drivers/mmc/card/block.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/mmc/card/block.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/mmc/card/block.c linux-rpi/drivers/mmc/card/block.c
+--- linux-3.10.37/drivers/mmc/card/block.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/mmc/card/block.c 2014-04-24 15:35:02.897551561 +0200
@@ -1333,7 +1333,7 @@
brq->data.blocks = 1;
}
@@ -30781,9 +30784,9 @@ diff -Nur linux-3.10.36.orig/drivers/mmc/card/block.c linux-3.10.36/drivers/mmc/
/* SPI multiblock writes terminate using a special
* token, not a STOP_TRANSMISSION request.
*/
-diff -Nur linux-3.10.36.orig/drivers/mmc/core/mmc.c linux-3.10.36/drivers/mmc/core/mmc.c
---- linux-3.10.36.orig/drivers/mmc/core/mmc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/mmc/core/mmc.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/mmc/core/mmc.c linux-rpi/drivers/mmc/core/mmc.c
+--- linux-3.10.37/drivers/mmc/core/mmc.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/mmc/core/mmc.c 2014-04-24 15:35:02.901551605 +0200
@@ -293,7 +293,7 @@
}
@@ -30793,9 +30796,9 @@ diff -Nur linux-3.10.36.orig/drivers/mmc/core/mmc.c linux-3.10.36/drivers/mmc/co
pr_err("%s: unrecognised EXT_CSD revision %d\n",
mmc_hostname(card->host), card->ext_csd.rev);
err = -EINVAL;
-diff -Nur linux-3.10.36.orig/drivers/mmc/core/sd.c linux-3.10.36/drivers/mmc/core/sd.c
---- linux-3.10.36.orig/drivers/mmc/core/sd.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/mmc/core/sd.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/mmc/core/sd.c linux-rpi/drivers/mmc/core/sd.c
+--- linux-3.10.37/drivers/mmc/core/sd.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/mmc/core/sd.c 2014-04-24 15:35:02.901551605 +0200
@@ -13,6 +13,8 @@
#include <linux/err.h>
#include <linux/slab.h>
@@ -30954,9 +30957,9 @@ diff -Nur linux-3.10.36.orig/drivers/mmc/core/sd.c linux-3.10.36/drivers/mmc/cor
/*
* Fetch and process SD Status register.
-diff -Nur linux-3.10.36.orig/drivers/mmc/host/Kconfig linux-3.10.36/drivers/mmc/host/Kconfig
---- linux-3.10.36.orig/drivers/mmc/host/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/mmc/host/Kconfig 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/mmc/host/Kconfig linux-rpi/drivers/mmc/host/Kconfig
+--- linux-3.10.37/drivers/mmc/host/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/mmc/host/Kconfig 2014-04-24 15:35:02.901551605 +0200
@@ -249,6 +249,27 @@
YMMV.
@@ -30985,9 +30988,9 @@ diff -Nur linux-3.10.36.orig/drivers/mmc/host/Kconfig linux-3.10.36/drivers/mmc/
config MMC_SDHCI_BCM2835
tristate "SDHCI platform support for the BCM2835 SD/MMC Controller"
depends on ARCH_BCM2835
-diff -Nur linux-3.10.36.orig/drivers/mmc/host/Makefile linux-3.10.36/drivers/mmc/host/Makefile
---- linux-3.10.36.orig/drivers/mmc/host/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/mmc/host/Makefile 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/mmc/host/Makefile linux-rpi/drivers/mmc/host/Makefile
+--- linux-3.10.37/drivers/mmc/host/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/mmc/host/Makefile 2014-04-24 15:35:02.901551605 +0200
@@ -15,6 +15,7 @@
obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o
obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci-sirf.o
@@ -30996,9 +30999,9 @@ diff -Nur linux-3.10.36.orig/drivers/mmc/host/Makefile linux-3.10.36/drivers/mmc
obj-$(CONFIG_MMC_WBSD) += wbsd.o
obj-$(CONFIG_MMC_AU1X) += au1xmmc.o
obj-$(CONFIG_MMC_OMAP) += omap.o
-diff -Nur linux-3.10.36.orig/drivers/mmc/host/sdhci-bcm2708.c linux-3.10.36/drivers/mmc/host/sdhci-bcm2708.c
---- linux-3.10.36.orig/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/mmc/host/sdhci-bcm2708.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/mmc/host/sdhci-bcm2708.c linux-rpi/drivers/mmc/host/sdhci-bcm2708.c
+--- linux-3.10.37/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/mmc/host/sdhci-bcm2708.c 2014-04-24 15:35:02.909551694 +0200
@@ -0,0 +1,1410 @@
+/*
+ * sdhci-bcm2708.c Support for SDHCI device on BCM2708
@@ -32410,9 +32413,9 @@ diff -Nur linux-3.10.36.orig/drivers/mmc/host/sdhci-bcm2708.c linux-3.10.36/driv
+MODULE_PARM_DESC(extra_messages, "Enable more sdcard warning messages");
+
+
-diff -Nur linux-3.10.36.orig/drivers/mmc/host/sdhci.c linux-3.10.36/drivers/mmc/host/sdhci.c
---- linux-3.10.36.orig/drivers/mmc/host/sdhci.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/mmc/host/sdhci.c 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/mmc/host/sdhci.c linux-rpi/drivers/mmc/host/sdhci.c
+--- linux-3.10.37/drivers/mmc/host/sdhci.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/mmc/host/sdhci.c 2014-04-24 15:35:02.909551694 +0200
@@ -28,6 +28,7 @@
#include <linux/mmc/mmc.h>
#include <linux/mmc/host.h>
@@ -32972,9 +32975,9 @@ diff -Nur linux-3.10.36.orig/drivers/mmc/host/sdhci.c linux-3.10.36/drivers/mmc/
(host->flags & SDHCI_USE_ADMA) ? "ADMA" :
(host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO");
-diff -Nur linux-3.10.36.orig/drivers/mmc/host/sdhci.h linux-3.10.36/drivers/mmc/host/sdhci.h
---- linux-3.10.36.orig/drivers/mmc/host/sdhci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/mmc/host/sdhci.h 2014-04-13 17:32:57.000000000 +0200
+diff -Nur linux-3.10.37/drivers/mmc/host/sdhci.h linux-rpi/drivers/mmc/host/sdhci.h
+--- linux-3.10.37/drivers/mmc/host/sdhci.h 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/mmc/host/sdhci.h 2014-04-24 15:35:02.909551694 +0200
@@ -289,6 +289,18 @@
void (*platform_reset_enter)(struct sdhci_host *host, u8 mask);
void (*platform_reset_exit)(struct sdhci_host *host, u8 mask);
@@ -33033,9 +33036,9 @@ diff -Nur linux-3.10.36.orig/drivers/mmc/host/sdhci.h linux-3.10.36/drivers/mmc/
+
+
#endif /* __SDHCI_HW_H */
-diff -Nur linux-3.10.36.orig/drivers/net/usb/smsc95xx.c linux-3.10.36/drivers/net/usb/smsc95xx.c
---- linux-3.10.36.orig/drivers/net/usb/smsc95xx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/net/usb/smsc95xx.c 2014-04-13 17:33:03.000000000 +0200
+diff -Nur linux-3.10.37/drivers/net/usb/smsc95xx.c linux-rpi/drivers/net/usb/smsc95xx.c
+--- linux-3.10.37/drivers/net/usb/smsc95xx.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/net/usb/smsc95xx.c 2014-04-24 15:35:03.209555036 +0200
@@ -61,6 +61,7 @@
#define SUSPEND_SUSPEND3 (0x08)
#define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
@@ -33115,9 +33118,9 @@ diff -Nur linux-3.10.36.orig/drivers/net/usb/smsc95xx.c linux-3.10.36/drivers/ne
/* try reading mac address from EEPROM */
if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
dev->net->dev_addr) == 0) {
-diff -Nur linux-3.10.36.orig/drivers/net/wireless/ath/ath9k/hif_usb.c linux-3.10.36/drivers/net/wireless/ath/ath9k/hif_usb.c
---- linux-3.10.36.orig/drivers/net/wireless/ath/ath9k/hif_usb.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/net/wireless/ath/ath9k/hif_usb.c 2014-04-13 17:33:03.000000000 +0200
+diff -Nur linux-3.10.37/drivers/net/wireless/ath/ath9k/hif_usb.c linux-rpi/drivers/net/wireless/ath/ath9k/hif_usb.c
+--- linux-3.10.37/drivers/net/wireless/ath/ath9k/hif_usb.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/net/wireless/ath/ath9k/hif_usb.c 2014-04-24 15:35:03.253555526 +0200
@@ -37,9 +37,11 @@
{ USB_DEVICE(0x13D3, 0x3350) }, /* Azurewave */
{ USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */
@@ -33130,9 +33133,9 @@ diff -Nur linux-3.10.36.orig/drivers/net/wireless/ath/ath9k/hif_usb.c linux-3.10
{ USB_DEVICE(0x0cf3, 0x7015),
.driver_info = AR9287_USB }, /* Atheros */
-diff -Nur linux-3.10.36.orig/drivers/net/wireless/rt2x00/rt2800.h linux-3.10.36/drivers/net/wireless/rt2x00/rt2800.h
---- linux-3.10.36.orig/drivers/net/wireless/rt2x00/rt2800.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/net/wireless/rt2x00/rt2800.h 2014-04-13 17:33:04.000000000 +0200
+diff -Nur linux-3.10.37/drivers/net/wireless/rt2x00/rt2800.h linux-rpi/drivers/net/wireless/rt2x00/rt2800.h
+--- linux-3.10.37/drivers/net/wireless/rt2x00/rt2800.h 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/net/wireless/rt2x00/rt2800.h 2014-04-24 15:35:03.369556819 +0200
@@ -70,6 +70,7 @@
#define RF3322 0x000c
#define RF3053 0x000d
@@ -33141,9 +33144,9 @@ diff -Nur linux-3.10.36.orig/drivers/net/wireless/rt2x00/rt2800.h linux-3.10.36/
#define RF3290 0x3290
#define RF5360 0x5360
#define RF5370 0x5370
-diff -Nur linux-3.10.36.orig/drivers/net/wireless/rt2x00/rt2800lib.c linux-3.10.36/drivers/net/wireless/rt2x00/rt2800lib.c
---- linux-3.10.36.orig/drivers/net/wireless/rt2x00/rt2800lib.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/net/wireless/rt2x00/rt2800lib.c 2014-04-13 17:33:04.000000000 +0200
+diff -Nur linux-3.10.37/drivers/net/wireless/rt2x00/rt2800lib.c linux-rpi/drivers/net/wireless/rt2x00/rt2800lib.c
+--- linux-3.10.37/drivers/net/wireless/rt2x00/rt2800lib.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/net/wireless/rt2x00/rt2800lib.c 2014-04-24 15:35:03.373556863 +0200
@@ -2599,6 +2599,7 @@
break;
case RF5360:
@@ -33192,9 +33195,9 @@ diff -Nur linux-3.10.36.orig/drivers/net/wireless/rt2x00/rt2800lib.c linux-3.10.
case RF5372:
case RF5390:
case RF5392:
-diff -Nur linux-3.10.36.orig/drivers/spi/Kconfig linux-3.10.36/drivers/spi/Kconfig
---- linux-3.10.36.orig/drivers/spi/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/spi/Kconfig 2014-04-13 17:33:08.000000000 +0200
+diff -Nur linux-3.10.37/drivers/spi/Kconfig linux-rpi/drivers/spi/Kconfig
+--- linux-3.10.37/drivers/spi/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/spi/Kconfig 2014-04-24 15:35:03.781561409 +0200
@@ -86,6 +86,14 @@
is for the regular SPI controller. Slave mode operation is not also
not supported.
@@ -33210,9 +33213,9 @@ diff -Nur linux-3.10.36.orig/drivers/spi/Kconfig linux-3.10.36/drivers/spi/Kconf
config SPI_BFIN5XX
tristate "SPI controller driver for ADI Blackfin5xx"
depends on BLACKFIN
-diff -Nur linux-3.10.36.orig/drivers/spi/Makefile linux-3.10.36/drivers/spi/Makefile
---- linux-3.10.36.orig/drivers/spi/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/spi/Makefile 2014-04-13 17:33:08.000000000 +0200
+diff -Nur linux-3.10.37/drivers/spi/Makefile linux-rpi/drivers/spi/Makefile
+--- linux-3.10.37/drivers/spi/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/spi/Makefile 2014-04-24 15:35:03.781561409 +0200
@@ -17,6 +17,7 @@
obj-$(CONFIG_SPI_BCM2835) += spi-bcm2835.o
obj-$(CONFIG_SPI_BCM63XX) += spi-bcm63xx.o
@@ -33221,9 +33224,9 @@ diff -Nur linux-3.10.36.orig/drivers/spi/Makefile linux-3.10.36/drivers/spi/Make
obj-$(CONFIG_SPI_BFIN_SPORT) += spi-bfin-sport.o
obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o
obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o
-diff -Nur linux-3.10.36.orig/drivers/spi/spi-bcm2708.c linux-3.10.36/drivers/spi/spi-bcm2708.c
---- linux-3.10.36.orig/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/spi/spi-bcm2708.c 2014-04-13 17:33:08.000000000 +0200
+diff -Nur linux-3.10.37/drivers/spi/spi-bcm2708.c linux-rpi/drivers/spi/spi-bcm2708.c
+--- linux-3.10.37/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/spi/spi-bcm2708.c 2014-04-24 15:35:03.781561409 +0200
@@ -0,0 +1,626 @@
+/*
+ * Driver for Broadcom BCM2708 SPI Controllers
@@ -33851,9 +33854,9 @@ diff -Nur linux-3.10.36.orig/drivers/spi/spi-bcm2708.c linux-3.10.36/drivers/spi
+MODULE_AUTHOR("Chris Boot <bootc@bootc.net>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
-diff -Nur linux-3.10.36.orig/drivers/staging/media/lirc/Kconfig linux-3.10.36/drivers/staging/media/lirc/Kconfig
---- linux-3.10.36.orig/drivers/staging/media/lirc/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/staging/media/lirc/Kconfig 2014-04-13 17:33:09.000000000 +0200
+diff -Nur linux-3.10.37/drivers/staging/media/lirc/Kconfig linux-rpi/drivers/staging/media/lirc/Kconfig
+--- linux-3.10.37/drivers/staging/media/lirc/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/staging/media/lirc/Kconfig 2014-04-24 15:35:03.925563013 +0200
@@ -38,6 +38,12 @@
help
Driver for Homebrew Parallel Port Receivers
@@ -33867,9 +33870,9 @@ diff -Nur linux-3.10.36.orig/drivers/staging/media/lirc/Kconfig linux-3.10.36/dr
config LIRC_SASEM
tristate "Sasem USB IR Remote"
depends on LIRC && USB
-diff -Nur linux-3.10.36.orig/drivers/staging/media/lirc/lirc_rpi.c linux-3.10.36/drivers/staging/media/lirc/lirc_rpi.c
---- linux-3.10.36.orig/drivers/staging/media/lirc/lirc_rpi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/staging/media/lirc/lirc_rpi.c 2014-04-13 17:33:09.000000000 +0200
+diff -Nur linux-3.10.37/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/staging/media/lirc/lirc_rpi.c
+--- linux-3.10.37/drivers/staging/media/lirc/lirc_rpi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/staging/media/lirc/lirc_rpi.c 2014-04-24 15:35:03.925563013 +0200
@@ -0,0 +1,693 @@
+/*
+ * lirc_rpi.c
@@ -34564,9 +34567,9 @@ diff -Nur linux-3.10.36.orig/drivers/staging/media/lirc/lirc_rpi.c linux-3.10.36
+
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Enable debugging messages");
-diff -Nur linux-3.10.36.orig/drivers/staging/media/lirc/Makefile linux-3.10.36/drivers/staging/media/lirc/Makefile
---- linux-3.10.36.orig/drivers/staging/media/lirc/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/staging/media/lirc/Makefile 2014-04-13 17:33:09.000000000 +0200
+diff -Nur linux-3.10.37/drivers/staging/media/lirc/Makefile linux-rpi/drivers/staging/media/lirc/Makefile
+--- linux-3.10.37/drivers/staging/media/lirc/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/staging/media/lirc/Makefile 2014-04-24 15:35:03.925563013 +0200
@@ -7,6 +7,7 @@
obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o
obj-$(CONFIG_LIRC_IMON) += lirc_imon.o
@@ -34575,9 +34578,9 @@ diff -Nur linux-3.10.36.orig/drivers/staging/media/lirc/Makefile linux-3.10.36/d
obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o
obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o
obj-$(CONFIG_LIRC_SIR) += lirc_sir.o
-diff -Nur linux-3.10.36.orig/drivers/thermal/bcm2835-thermal.c linux-3.10.36/drivers/thermal/bcm2835-thermal.c
---- linux-3.10.36.orig/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/thermal/bcm2835-thermal.c 2014-04-13 17:33:10.000000000 +0200
+diff -Nur linux-3.10.37/drivers/thermal/bcm2835-thermal.c linux-rpi/drivers/thermal/bcm2835-thermal.c
+--- linux-3.10.37/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/thermal/bcm2835-thermal.c 2014-04-24 15:35:04.089564840 +0200
@@ -0,0 +1,184 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -34763,9 +34766,9 @@ diff -Nur linux-3.10.36.orig/drivers/thermal/bcm2835-thermal.c linux-3.10.36/dri
+MODULE_DESCRIPTION("Thermal driver for bcm2835 chip");
+
+module_platform_driver(bcm2835_thermal_driver);
-diff -Nur linux-3.10.36.orig/drivers/thermal/Kconfig linux-3.10.36/drivers/thermal/Kconfig
---- linux-3.10.36.orig/drivers/thermal/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/thermal/Kconfig 2014-04-13 17:33:10.000000000 +0200
+diff -Nur linux-3.10.37/drivers/thermal/Kconfig linux-rpi/drivers/thermal/Kconfig
+--- linux-3.10.37/drivers/thermal/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/thermal/Kconfig 2014-04-24 15:35:04.089564840 +0200
@@ -169,4 +169,11 @@
enforce idle time which results in more package C-state residency. The
user interface is exposed via generic thermal framework.
@@ -34778,18 +34781,18 @@ diff -Nur linux-3.10.36.orig/drivers/thermal/Kconfig linux-3.10.36/drivers/therm
+
endif
+
-diff -Nur linux-3.10.36.orig/drivers/thermal/Makefile linux-3.10.36/drivers/thermal/Makefile
---- linux-3.10.36.orig/drivers/thermal/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/thermal/Makefile 2014-04-13 17:33:10.000000000 +0200
+diff -Nur linux-3.10.37/drivers/thermal/Makefile linux-rpi/drivers/thermal/Makefile
+--- linux-3.10.37/drivers/thermal/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/thermal/Makefile 2014-04-24 15:35:04.089564840 +0200
@@ -23,4 +23,5 @@
obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o
obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o
obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o
+obj-$(CONFIG_THERMAL_BCM2835) += bcm2835-thermal.o
-diff -Nur linux-3.10.36.orig/drivers/tty/serial/amba-pl011.c linux-3.10.36/drivers/tty/serial/amba-pl011.c
---- linux-3.10.36.orig/drivers/tty/serial/amba-pl011.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/tty/serial/amba-pl011.c 2014-04-13 17:33:10.000000000 +0200
+diff -Nur linux-3.10.37/drivers/tty/serial/amba-pl011.c linux-rpi/drivers/tty/serial/amba-pl011.c
+--- linux-3.10.37/drivers/tty/serial/amba-pl011.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/tty/serial/amba-pl011.c 2014-04-24 15:35:04.105565018 +0200
@@ -84,7 +84,7 @@
static unsigned int get_fifosize_arm(unsigned int periphid)
@@ -34799,9 +34802,9 @@ diff -Nur linux-3.10.36.orig/drivers/tty/serial/amba-pl011.c linux-3.10.36/drive
return rev < 3 ? 16 : 32;
}
-diff -Nur linux-3.10.36.orig/drivers/usb/core/generic.c linux-3.10.36/drivers/usb/core/generic.c
---- linux-3.10.36.orig/drivers/usb/core/generic.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/usb/core/generic.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/core/generic.c linux-rpi/drivers/usb/core/generic.c
+--- linux-3.10.37/drivers/usb/core/generic.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/usb/core/generic.c 2014-04-24 15:35:04.137565375 +0200
@@ -152,6 +152,7 @@
dev_warn(&udev->dev,
"no configuration chosen from %d choice%s\n",
@@ -34810,9 +34813,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/core/generic.c linux-3.10.36/drivers/us
}
return i;
}
-diff -Nur linux-3.10.36.orig/drivers/usb/core/message.c linux-3.10.36/drivers/usb/core/message.c
---- linux-3.10.36.orig/drivers/usb/core/message.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/usb/core/message.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/core/message.c linux-rpi/drivers/usb/core/message.c
+--- linux-3.10.37/drivers/usb/core/message.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/usb/core/message.c 2014-04-24 15:35:04.141565419 +0200
@@ -1875,6 +1875,85 @@
if (cp->string == NULL &&
!(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
@@ -34899,9 +34902,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/core/message.c linux-3.10.36/drivers/us
/* Now that the interfaces are installed, re-enable LPM. */
usb_unlocked_enable_lpm(dev);
-diff -Nur linux-3.10.36.orig/drivers/usb/core/otg_whitelist.h linux-3.10.36/drivers/usb/core/otg_whitelist.h
---- linux-3.10.36.orig/drivers/usb/core/otg_whitelist.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/usb/core/otg_whitelist.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/core/otg_whitelist.h linux-rpi/drivers/usb/core/otg_whitelist.h
+--- linux-3.10.37/drivers/usb/core/otg_whitelist.h 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/usb/core/otg_whitelist.h 2014-04-24 15:35:04.141565419 +0200
@@ -19,33 +19,82 @@
static struct usb_device_id whitelist_table [] = {
@@ -35117,9 +35120,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/core/otg_whitelist.h linux-3.10.36/driv
#endif
}
-diff -Nur linux-3.10.36.orig/drivers/usb/gadget/file_storage.c linux-3.10.36/drivers/usb/gadget/file_storage.c
---- linux-3.10.36.orig/drivers/usb/gadget/file_storage.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/gadget/file_storage.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/gadget/file_storage.c linux-rpi/drivers/usb/gadget/file_storage.c
+--- linux-3.10.37/drivers/usb/gadget/file_storage.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/gadget/file_storage.c 2014-04-24 15:35:04.153565553 +0200
@@ -0,0 +1,3676 @@
+/*
+ * file_storage.c -- File-backed USB Storage Gadget, for USB development
@@ -38797,9 +38800,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/gadget/file_storage.c linux-3.10.36/dri
+ kref_put(&fsg->ref, fsg_release);
+}
+module_exit(fsg_cleanup);
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/changes.txt linux-3.10.36/drivers/usb/host/dwc_common_port/changes.txt
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/changes.txt 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/changes.txt linux-rpi/drivers/usb/host/dwc_common_port/changes.txt
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/changes.txt 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,174 @@
+
+dwc_read_reg32() and friends now take an additional parameter, a pointer to an
@@ -38975,9 +38978,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/changes.txt linux-
+A DWC_LIBMODULE #define has also been added. If this is not defined, then the
+module code in dwc_common_linux.c is not compiled in. This allows linking the
+library code directly into a driver module, instead of as a standalone module.
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-3.10.36/drivers/usb/host/dwc_common_port/doc/doxygen.cfg
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi/drivers/usb/host/dwc_common_port/doc/doxygen.cfg
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,270 @@
+# Doxyfile 1.4.5
+
@@ -39249,9 +39252,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/doc/doxygen.cfg li
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_cc.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_cc.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.c
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.c 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,532 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $
@@ -39785,9 +39788,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.1
+}
+
+#endif /* DWC_CCLIB */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_cc.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_cc.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.h
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.h 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,225 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $
@@ -40014,9 +40017,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.1
+
+#endif /* _DWC_CC_H_ */
+
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,1308 @@
+#include "dwc_os.h"
+#include "dwc_list.h"
@@ -41326,9 +41329,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c
+{
+ return wq->pending;
+}
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_common_linux.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_linux.c
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,1431 @@
+#include <linux/kernel.h>
+#include <linux/init.h>
@@ -42761,9 +42764,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_common_linux.c
+MODULE_LICENSE ("GPL");
+
+#endif /* DWC_LIBMODULE */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,1275 @@
+#include "dwc_os.h"
+#include "dwc_list.h"
@@ -44040,9 +44043,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c
+{
+ return wq->pending;
+}
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_crypto.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_crypto.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.c
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.c 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,308 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $
@@ -44352,9 +44355,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_crypto.c linux
+}
+
+#endif /* DWC_CRYPTOLIB */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_crypto.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_crypto.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.h
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.h 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,111 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $
@@ -44467,9 +44470,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_crypto.h linux
+#endif
+
+#endif /* _DWC_CRYPTO_H_ */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_dh.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_dh.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.c
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.c 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,291 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $
@@ -44762,9 +44765,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.1
+#endif /* !CONFIG_MACH_IPMATE */
+
+#endif /* DWC_CRYPTOLIB */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_dh.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_dh.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.h
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.h 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,106 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $
@@ -44872,9 +44875,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.1
+#endif
+
+#endif /* _DWC_DH_H_ */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_list.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_list.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_list.h
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_list.h 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,594 @@
+/* $OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $ */
+/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */
@@ -45470,9 +45473,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_list.h linux-3
+#endif
+
+#endif /* _DWC_LIST_H_ */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_mem.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_mem.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_mem.c
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_mem.c 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,245 @@
+/* Memory Debugging */
+#ifdef DWC_DEBUG_MEMORY
@@ -45719,9 +45722,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.
+}
+
+#endif /* DWC_DEBUG_MEMORY */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_modpow.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_modpow.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.c
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.c 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,636 @@
+/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows.
+ *
@@ -46359,9 +46362,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_modpow.c linux
+#endif /* CONFIG_MACH_IPMATE */
+
+#endif /*DWC_CRYPTOLIB */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_modpow.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_modpow.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.h
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.h 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,34 @@
+/*
+ * dwc_modpow.h
@@ -46397,9 +46400,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_modpow.h linux
+#endif
+
+#endif /* _LINUX_BIGNUM_H */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_notifier.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_notifier.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.c
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.c 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,319 @@
+#ifdef DWC_NOTIFYLIB
+
@@ -46720,9 +46723,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_notifier.c lin
+}
+
+#endif /* DWC_NOTIFYLIB */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_notifier.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_notifier.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.h
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.h 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,122 @@
+
+#ifndef __DWC_NOTIFIER_H__
@@ -46846,9 +46849,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_notifier.h lin
+#endif
+
+#endif /* __DWC_NOTIFIER_H__ */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_os.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_os.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_os.h
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_os.h 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,1262 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $
@@ -48112,9 +48115,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.1
+#endif
+
+#endif /* _DWC_OS_H_ */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/Makefile linux-3.10.36/drivers/usb/host/dwc_common_port/Makefile
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/Makefile 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/Makefile linux-rpi/drivers/usb/host/dwc_common_port/Makefile
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,58 @@
+#
+# Makefile for DWC_common library
@@ -48174,9 +48177,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/Makefile linux-3.1
+
+clean:
+ rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-3.10.36/drivers/usb/host/dwc_common_port/Makefile.fbsd
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/Makefile.fbsd 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi/drivers/usb/host/dwc_common_port/Makefile.fbsd
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile.fbsd 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,17 @@
+CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include
+CFLAGS += -DDWC_FREEBSD
@@ -48195,9 +48198,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/Makefile.fbsd linu
+ dwc_common_fbsd.c dwc_mem.c
+
+.include <bsd.kmod.mk>
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.10.36/drivers/usb/host/dwc_common_port/Makefile.linux
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/Makefile.linux 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi/drivers/usb/host/dwc_common_port/Makefile.linux
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile.linux 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,49 @@
+#
+# Makefile for DWC_common library
@@ -48248,9 +48251,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/Makefile.linux lin
+
+clean:
+ rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/usb.h linux-3.10.36/drivers/usb/host/dwc_common_port/usb.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_common_port/usb.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_common_port/usb.h linux-rpi/drivers/usb/host/dwc_common_port/usb.h
+--- linux-3.10.37/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/usb.h 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,946 @@
+/*
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -49198,9 +49201,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/usb.h linux-3.10.3
+#endif
+
+#endif /* _USB_H_ */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-3.10.36/drivers/usb/host/dwc_otg/doc/doxygen.cfg
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi/drivers/usb/host/dwc_otg/doc/doxygen.cfg
+--- linux-3.10.37/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,224 @@
+# Doxyfile 1.3.9.1
+
@@ -49426,9 +49429,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-3.10
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.10.36/drivers/usb/host/dwc_otg/dummy_audio.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dummy_audio.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi/drivers/usb/host/dwc_otg/dummy_audio.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dummy_audio.c 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,1575 @@
+/*
+ * zero.c -- Gadget Zero, for USB development
@@ -51005,9 +51008,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.10.3
+ remove_proc_entry("isoc_test", NULL);
+}
+module_exit (cleanup);
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_cfi_common.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi/drivers/usb/host/dwc_otg/dwc_cfi_common.h
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,142 @@
+/* ==========================================================================
+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
@@ -51151,9 +51154,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.1
+typedef struct cfi_string cfi_string_t;
+
+#endif
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_adp.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,854 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $
@@ -52009,9 +52012,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-3.10.3
+#endif
+ return 1;
+}
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_adp.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.h
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,80 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $
@@ -52093,9 +52096,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-3.10.3
+extern int32_t dwc_otg_adp_handle_srp_intr(dwc_otg_core_if_t * core_if);
+
+#endif //__DWC_OTG_ADP_H__
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_attr.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,1210 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $
@@ -53307,9 +53310,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.10.
+ device_remove_file(&dev->dev, &dev_attr_sleep_status);
+#endif
+}
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_attr.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.h
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2014-04-24 15:35:04.173565776 +0200
@@ -0,0 +1,89 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $
@@ -53400,9 +53403,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.10.
+#endif
+ );
+#endif
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cfi.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2014-04-24 15:35:04.173565776 +0200
@@ -0,0 +1,1876 @@
+/* ==========================================================================
+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
@@ -55280,9 +55283,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.10.3
+}
+
+#endif //DWC_UTE_CFI
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cfi.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.h
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2014-04-24 15:35:04.173565776 +0200
@@ -0,0 +1,320 @@
+/* ==========================================================================
+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
@@ -55604,9 +55607,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.10.3
+int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl);
+
+#endif /* (__DWC_OTG_CFI_H__) */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cil.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2014-04-24 15:35:04.173565776 +0200
@@ -0,0 +1,7151 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $
@@ -62759,9 +62762,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.10.3
+ dwc_otg_pcd_start_srp_timer(core_if);
+ return;
+}
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cil.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.h
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2014-04-24 15:35:04.173565776 +0200
@@ -0,0 +1,1464 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $
@@ -64227,9 +64230,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.10.3
+//////////////////////////////////////////////////////////////////////
+
+#endif
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2014-04-24 15:35:04.173565776 +0200
@@ -0,0 +1,1588 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $
@@ -65819,9 +65822,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3
+
+ return retval;
+}
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_core_if.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_core_if.h
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2014-04-24 15:35:04.173565776 +0200
@@ -0,0 +1,705 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $
@@ -66528,9 +66531,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.
+/** @} */
+
+#endif /* __DWC_CORE_IF_H__ */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_dbg.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_dbg.h
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2014-04-24 15:35:04.173565776 +0200
@@ -0,0 +1,117 @@
+/* ==========================================================================
+ *
@@ -66649,9 +66652,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.10.3
+
+#endif /*DEBUG*/
+#endif
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_driver.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2014-04-24 15:35:04.173565776 +0200
@@ -0,0 +1,1742 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $
@@ -68395,9 +68398,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.1
+ </td></tr>
+
+*/
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_driver.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.h
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2014-04-24 15:35:04.173565776 +0200
@@ -0,0 +1,86 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $
@@ -68485,9 +68488,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.1
+#endif
+
+#endif
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2014-04-24 15:35:04.173565776 +0200
@@ -0,0 +1,3685 @@
+
+/* ==========================================================================
@@ -72174,9 +72177,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.10.3
+}
+
+#endif /* DWC_DEVICE_ONLY */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2014-04-24 15:35:04.173565776 +0200
@@ -0,0 +1,1132 @@
+/*==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $
@@ -73310,9 +73313,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3
+}
+
+#endif /* DWC_DEVICE_ONLY */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.h
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2014-04-24 15:35:04.173565776 +0200
@@ -0,0 +1,851 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $
@@ -74165,9 +74168,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.10.3
+#endif
+#endif
+#endif /* DWC_DEVICE_ONLY */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2014-04-24 15:35:04.173565776 +0200
@@ -0,0 +1,417 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $
@@ -74586,9 +74589,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.1
+
+#endif /* __DWC_HCD_IF_H__ */
+#endif /* DWC_DEVICE_ONLY */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,2741 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $
@@ -77331,9 +77334,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3
+ return retval;
+}
+#endif /* DWC_DEVICE_ONLY */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,972 @@
+
+/* ==========================================================================
@@ -78307,9 +78310,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-
+}
+
+#endif /* DWC_DEVICE_ONLY */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,959 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $
@@ -79270,9 +79273,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-
+}
+
+#endif /* DWC_DEVICE_ONLY */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,113 @@
+#include "dwc_otg_regs.h"
+#include "dwc_otg_dbg.h"
@@ -79387,9 +79390,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-3
+
+ return;
+}
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,48 @@
+#ifndef __DWC_OTG_MPHI_FIX_H__
+#define __DWC_OTG_MPHI_FIX_H__
@@ -79439,9 +79442,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-3
+extern bool fiq_fix_enable, nak_holdoff_enable, fiq_split_enable;
+
+#endif
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,188 @@
+#ifndef _DWC_OS_DEP_H_
+#define _DWC_OS_DEP_H_
@@ -79631,9 +79634,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-3.1
+
+
+#endif /* _DWC_OS_DEP_H_ */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,2708 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $
@@ -82343,9 +82346,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.10.3
+}
+
+#endif /* DWC_HOST_ONLY */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.h
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,266 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $
@@ -82613,9 +82616,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.10.3
+extern void do_test_mode(void *data);
+#endif
+#endif /* DWC_HOST_ONLY */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,360 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $
@@ -82977,9 +82980,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.1
+#endif /* __DWC_PCD_IF_H__ */
+
+#endif /* DWC_HOST_ONLY */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,5147 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $
@@ -88128,9 +88131,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3
+}
+
+#endif /* DWC_HOST_ONLY */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,1358 @@
+ /* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $
@@ -89490,9 +89493,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-
+EXPORT_SYMBOL(usb_gadget_unregister_driver);
+
+#endif /* DWC_HOST_ONLY */
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_regs.h
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_regs.h
+--- linux-3.10.37/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,2550 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $
@@ -92044,9 +92047,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.10.
+} gpwrdn_data_t;
+
+#endif
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/Makefile linux-3.10.36/drivers/usb/host/dwc_otg/Makefile
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/Makefile 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/Makefile linux-rpi/drivers/usb/host/dwc_otg/Makefile
+--- linux-3.10.37/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/Makefile 2014-04-24 15:35:04.169565731 +0200
@@ -0,0 +1,81 @@
+#
+# Makefile for DWC_otg Highspeed USB controller driver
@@ -92129,9 +92132,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/Makefile linux-3.10.36/dri
+ rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers
+
+endif
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-3.10.36/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm
+--- linux-3.10.37/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,337 @@
+package dwc_otg_test;
+
@@ -92470,9 +92473,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux
+);
+
+1;
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/Makefile linux-3.10.36/drivers/usb/host/dwc_otg/test/Makefile
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/test/Makefile 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/test/Makefile linux-rpi/drivers/usb/host/dwc_otg/test/Makefile
+--- linux-3.10.37/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/test/Makefile 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,16 @@
+
+PERL=/usr/bin/perl
@@ -92490,9 +92493,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/Makefile linux-3.10.3
+ else echo "=======> $$test, FAILED" ; \
+ fi \
+ done
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-3.10.36/drivers/usb/host/dwc_otg/test/test_mod_param.pl
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi/drivers/usb/host/dwc_otg/test/test_mod_param.pl
+--- linux-3.10.37/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,133 @@
+#!/usr/bin/perl -w
+#
@@ -92627,9 +92630,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/test_mod_param.pl lin
+
+test_main();
+0;
-diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-3.10.36/drivers/usb/host/dwc_otg/test/test_sysfs.pl
---- linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi/drivers/usb/host/dwc_otg/test/test_sysfs.pl
+--- linux-3.10.37/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2014-04-24 15:35:04.177565820 +0200
@@ -0,0 +1,193 @@
+#!/usr/bin/perl -w
+#
@@ -92824,9 +92827,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-3
+
+test_main();
+0;
-diff -Nur linux-3.10.36.orig/drivers/usb/host/Kconfig linux-3.10.36/drivers/usb/host/Kconfig
---- linux-3.10.36.orig/drivers/usb/host/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/usb/host/Kconfig 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/Kconfig linux-rpi/drivers/usb/host/Kconfig
+--- linux-3.10.37/drivers/usb/host/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/usb/host/Kconfig 2014-04-24 15:35:04.169565731 +0200
@@ -663,6 +663,19 @@
To compile this driver a module, choose M here: the module
will be called "hwa-hc".
@@ -92847,9 +92850,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/Kconfig linux-3.10.36/drivers/usb/
config USB_IMX21_HCD
tristate "i.MX21 HCD support"
depends on ARM && ARCH_MXC
-diff -Nur linux-3.10.36.orig/drivers/usb/host/Makefile linux-3.10.36/drivers/usb/host/Makefile
---- linux-3.10.36.orig/drivers/usb/host/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/usb/host/Makefile 2014-04-13 17:33:11.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/host/Makefile linux-rpi/drivers/usb/host/Makefile
+--- linux-3.10.37/drivers/usb/host/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/usb/host/Makefile 2014-04-24 15:35:04.169565731 +0200
@@ -47,6 +47,8 @@
obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o
@@ -92859,9 +92862,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/host/Makefile linux-3.10.36/drivers/usb
obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o
obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o
obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o
-diff -Nur linux-3.10.36.orig/drivers/usb/Makefile linux-3.10.36/drivers/usb/Makefile
---- linux-3.10.36.orig/drivers/usb/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/usb/Makefile 2014-04-13 17:33:10.000000000 +0200
+diff -Nur linux-3.10.37/drivers/usb/Makefile linux-rpi/drivers/usb/Makefile
+--- linux-3.10.37/drivers/usb/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/usb/Makefile 2014-04-24 15:35:04.129565286 +0200
@@ -23,6 +23,7 @@
obj-$(CONFIG_USB_R8A66597_HCD) += host/
obj-$(CONFIG_USB_HWA_HCD) += host/
@@ -92870,9 +92873,9 @@ diff -Nur linux-3.10.36.orig/drivers/usb/Makefile linux-3.10.36/drivers/usb/Make
obj-$(CONFIG_USB_IMX21_HCD) += host/
obj-$(CONFIG_USB_FSL_MPH_DR_OF) += host/
-diff -Nur linux-3.10.36.orig/drivers/video/bcm2708_fb.c linux-3.10.36/drivers/video/bcm2708_fb.c
---- linux-3.10.36.orig/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/video/bcm2708_fb.c 2014-04-13 17:33:14.000000000 +0200
+diff -Nur linux-3.10.37/drivers/video/bcm2708_fb.c linux-rpi/drivers/video/bcm2708_fb.c
+--- linux-3.10.37/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/video/bcm2708_fb.c 2014-04-24 15:35:04.265566801 +0200
@@ -0,0 +1,763 @@
+/*
+ * linux/drivers/video/bcm2708_fb.c
@@ -93637,9 +93640,9 @@ diff -Nur linux-3.10.36.orig/drivers/video/bcm2708_fb.c linux-3.10.36/drivers/vi
+MODULE_PARM_DESC(fbheight, "Height of ARM Framebuffer");
+MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer");
+MODULE_PARM_DESC(fbswap, "Swap order of red and blue in 24 and 32 bit modes");
-diff -Nur linux-3.10.36.orig/drivers/video/cfbimgblt.c linux-3.10.36/drivers/video/cfbimgblt.c
---- linux-3.10.36.orig/drivers/video/cfbimgblt.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/video/cfbimgblt.c 2014-04-13 17:33:14.000000000 +0200
+diff -Nur linux-3.10.37/drivers/video/cfbimgblt.c linux-rpi/drivers/video/cfbimgblt.c
+--- linux-3.10.37/drivers/video/cfbimgblt.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/video/cfbimgblt.c 2014-04-24 15:35:04.265566801 +0200
@@ -28,6 +28,11 @@
*
* Also need to add code to deal with cards endians that are different than
@@ -93813,9 +93816,9 @@ diff -Nur linux-3.10.36.orig/drivers/video/cfbimgblt.c linux-3.10.36/drivers/vid
slow_imageblit(image, p, dst1, fgcolor, bgcolor,
start_index, pitch_index);
} else
-diff -Nur linux-3.10.36.orig/drivers/video/fbmem.c linux-3.10.36/drivers/video/fbmem.c
---- linux-3.10.36.orig/drivers/video/fbmem.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/video/fbmem.c 2014-04-13 17:33:14.000000000 +0200
+diff -Nur linux-3.10.37/drivers/video/fbmem.c linux-rpi/drivers/video/fbmem.c
+--- linux-3.10.37/drivers/video/fbmem.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/video/fbmem.c 2014-04-24 15:35:04.277566935 +0200
@@ -1074,6 +1074,25 @@
return ret;
}
@@ -93874,9 +93877,9 @@ diff -Nur linux-3.10.36.orig/drivers/video/fbmem.c linux-3.10.36/drivers/video/f
arg = (unsigned long) compat_ptr(arg);
case FBIOBLANK:
ret = do_fb_ioctl(info, cmd, arg);
-diff -Nur linux-3.10.36.orig/drivers/video/Kconfig linux-3.10.36/drivers/video/Kconfig
---- linux-3.10.36.orig/drivers/video/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/video/Kconfig 2014-04-13 17:33:13.000000000 +0200
+diff -Nur linux-3.10.37/drivers/video/Kconfig linux-rpi/drivers/video/Kconfig
+--- linux-3.10.37/drivers/video/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/video/Kconfig 2014-04-24 15:35:04.249566623 +0200
@@ -310,6 +310,20 @@
help
Support the Permedia2 FIFO disconnect feature.
@@ -93898,9 +93901,9 @@ diff -Nur linux-3.10.36.orig/drivers/video/Kconfig linux-3.10.36/drivers/video/K
config FB_ARMCLCD
tristate "ARM PrimeCell PL110 support"
depends on FB && ARM && ARM_AMBA
-diff -Nur linux-3.10.36.orig/drivers/video/logo/logo_linux_clut224.ppm linux-3.10.36/drivers/video/logo/logo_linux_clut224.ppm
---- linux-3.10.36.orig/drivers/video/logo/logo_linux_clut224.ppm 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/video/logo/logo_linux_clut224.ppm 2014-04-13 17:33:14.000000000 +0200
+diff -Nur linux-3.10.37/drivers/video/logo/logo_linux_clut224.ppm linux-rpi/drivers/video/logo/logo_linux_clut224.ppm
+--- linux-3.10.37/drivers/video/logo/logo_linux_clut224.ppm 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/video/logo/logo_linux_clut224.ppm 2014-04-24 15:35:04.285567024 +0200
@@ -1,1604 +1,883 @@
P3
-# Standard 224-color Linux logo
@@ -96387,9 +96390,9 @@ diff -Nur linux-3.10.36.orig/drivers/video/logo/logo_linux_clut224.ppm linux-3.1
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0
-diff -Nur linux-3.10.36.orig/drivers/video/Makefile linux-3.10.36/drivers/video/Makefile
---- linux-3.10.36.orig/drivers/video/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/video/Makefile 2014-04-13 17:33:13.000000000 +0200
+diff -Nur linux-3.10.37/drivers/video/Makefile linux-rpi/drivers/video/Makefile
+--- linux-3.10.37/drivers/video/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/video/Makefile 2014-04-24 15:35:04.249566623 +0200
@@ -100,6 +100,7 @@
obj-$(CONFIG_FB_VOODOO1) += sstfb.o
obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o
@@ -96398,9 +96401,9 @@ diff -Nur linux-3.10.36.orig/drivers/video/Makefile linux-3.10.36/drivers/video/
obj-$(CONFIG_FB_68328) += 68328fb.o
obj-$(CONFIG_FB_GBE) += gbefb.o
obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o
-diff -Nur linux-3.10.36.orig/drivers/w1/masters/w1-gpio.c linux-3.10.36/drivers/w1/masters/w1-gpio.c
---- linux-3.10.36.orig/drivers/w1/masters/w1-gpio.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/w1/masters/w1-gpio.c 2014-04-13 17:33:16.000000000 +0200
+diff -Nur linux-3.10.37/drivers/w1/masters/w1-gpio.c linux-rpi/drivers/w1/masters/w1-gpio.c
+--- linux-3.10.37/drivers/w1/masters/w1-gpio.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/w1/masters/w1-gpio.c 2014-04-24 15:35:04.349567736 +0200
@@ -23,6 +23,9 @@
#include "../w1.h"
#include "../w1_int.h"
@@ -96442,9 +96445,9 @@ diff -Nur linux-3.10.36.orig/drivers/w1/masters/w1-gpio.c linux-3.10.36/drivers/
err = w1_add_master_device(master);
if (err) {
dev_err(&pdev->dev, "w1_add_master device failed\n");
-diff -Nur linux-3.10.36.orig/drivers/w1/w1.h linux-3.10.36/drivers/w1/w1.h
---- linux-3.10.36.orig/drivers/w1/w1.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/w1/w1.h 2014-04-13 17:33:16.000000000 +0200
+diff -Nur linux-3.10.37/drivers/w1/w1.h linux-rpi/drivers/w1/w1.h
+--- linux-3.10.37/drivers/w1/w1.h 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/w1/w1.h 2014-04-24 15:35:04.349567736 +0200
@@ -148,6 +148,12 @@
*/
u8 (*set_pullup)(void *, int);
@@ -96458,9 +96461,9 @@ diff -Nur linux-3.10.36.orig/drivers/w1/w1.h linux-3.10.36/drivers/w1/w1.h
/** Really nice hardware can handles the different types of ROM search
* w1_master* is passed to the slave found callback.
*/
-diff -Nur linux-3.10.36.orig/drivers/w1/w1_int.c linux-3.10.36/drivers/w1/w1_int.c
---- linux-3.10.36.orig/drivers/w1/w1_int.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/w1/w1_int.c 2014-04-13 17:33:16.000000000 +0200
+diff -Nur linux-3.10.37/drivers/w1/w1_int.c linux-rpi/drivers/w1/w1_int.c
+--- linux-3.10.37/drivers/w1/w1_int.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/w1/w1_int.c 2014-04-24 15:35:04.349567736 +0200
@@ -117,19 +117,21 @@
printk(KERN_ERR "w1_add_master_device: invalid function set\n");
return(-EINVAL);
@@ -96490,9 +96493,9 @@ diff -Nur linux-3.10.36.orig/drivers/w1/w1_int.c linux-3.10.36/drivers/w1/w1_int
/* Lock until the device is added (or not) to w1_masters. */
mutex_lock(&w1_mlock);
/* Search for the first available id (starting at 1). */
-diff -Nur linux-3.10.36.orig/drivers/w1/w1_io.c linux-3.10.36/drivers/w1/w1_io.c
---- linux-3.10.36.orig/drivers/w1/w1_io.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/w1/w1_io.c 2014-04-13 17:33:16.000000000 +0200
+diff -Nur linux-3.10.37/drivers/w1/w1_io.c linux-rpi/drivers/w1/w1_io.c
+--- linux-3.10.37/drivers/w1/w1_io.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/w1/w1_io.c 2014-04-24 15:35:04.349567736 +0200
@@ -127,10 +127,22 @@
static void w1_post_write(struct w1_master *dev)
{
@@ -96519,9 +96522,9 @@ diff -Nur linux-3.10.36.orig/drivers/w1/w1_io.c linux-3.10.36/drivers/w1/w1_io.c
dev->pullup_duration = 0;
}
}
-diff -Nur linux-3.10.36.orig/drivers/watchdog/bcm2708_wdog.c linux-3.10.36/drivers/watchdog/bcm2708_wdog.c
---- linux-3.10.36.orig/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/drivers/watchdog/bcm2708_wdog.c 2014-04-13 17:33:16.000000000 +0200
+diff -Nur linux-3.10.37/drivers/watchdog/bcm2708_wdog.c linux-rpi/drivers/watchdog/bcm2708_wdog.c
+--- linux-3.10.37/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/watchdog/bcm2708_wdog.c 2014-04-24 15:35:04.353567781 +0200
@@ -0,0 +1,385 @@
+/*
+ * Broadcom BCM2708 watchdog driver.
@@ -96908,9 +96911,9 @@ diff -Nur linux-3.10.36.orig/drivers/watchdog/bcm2708_wdog.c linux-3.10.36/drive
+MODULE_ALIAS_MISCDEV(TEMP_MINOR);
+MODULE_LICENSE("GPL");
+
-diff -Nur linux-3.10.36.orig/drivers/watchdog/Kconfig linux-3.10.36/drivers/watchdog/Kconfig
---- linux-3.10.36.orig/drivers/watchdog/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/watchdog/Kconfig 2014-04-13 17:33:16.000000000 +0200
+diff -Nur linux-3.10.37/drivers/watchdog/Kconfig linux-rpi/drivers/watchdog/Kconfig
+--- linux-3.10.37/drivers/watchdog/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/watchdog/Kconfig 2014-04-24 15:35:04.349567736 +0200
@@ -391,6 +391,12 @@
To compile this driver as a module, choose M here: the
module will be called retu_wdt.
@@ -96924,9 +96927,9 @@ diff -Nur linux-3.10.36.orig/drivers/watchdog/Kconfig linux-3.10.36/drivers/watc
# AVR32 Architecture
config AT32AP700X_WDT
-diff -Nur linux-3.10.36.orig/drivers/watchdog/Makefile linux-3.10.36/drivers/watchdog/Makefile
---- linux-3.10.36.orig/drivers/watchdog/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/drivers/watchdog/Makefile 2014-04-13 17:33:16.000000000 +0200
+diff -Nur linux-3.10.37/drivers/watchdog/Makefile linux-rpi/drivers/watchdog/Makefile
+--- linux-3.10.37/drivers/watchdog/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/drivers/watchdog/Makefile 2014-04-24 15:35:04.349567736 +0200
@@ -54,6 +54,7 @@
obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o
@@ -96935,9 +96938,9 @@ diff -Nur linux-3.10.36.orig/drivers/watchdog/Makefile linux-3.10.36/drivers/wat
# AVR32 Architecture
obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
-diff -Nur linux-3.10.36.orig/include/linux/broadcom/vc_cma.h linux-3.10.36/include/linux/broadcom/vc_cma.h
---- linux-3.10.36.orig/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/include/linux/broadcom/vc_cma.h 2014-04-13 17:33:18.000000000 +0200
+diff -Nur linux-3.10.37/include/linux/broadcom/vc_cma.h linux-rpi/include/linux/broadcom/vc_cma.h
+--- linux-3.10.37/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/include/linux/broadcom/vc_cma.h 2014-04-24 15:35:04.729571969 +0200
@@ -0,0 +1,30 @@
+/*****************************************************************************
+* Copyright 2012 Broadcom Corporation. All rights reserved.
@@ -96969,9 +96972,9 @@ diff -Nur linux-3.10.36.orig/include/linux/broadcom/vc_cma.h linux-3.10.36/inclu
+
+#endif /* VC_CMA_H */
+
-diff -Nur linux-3.10.36.orig/include/linux/mmc/host.h linux-3.10.36/include/linux/mmc/host.h
---- linux-3.10.36.orig/include/linux/mmc/host.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/include/linux/mmc/host.h 2014-04-13 17:33:19.000000000 +0200
+diff -Nur linux-3.10.37/include/linux/mmc/host.h linux-rpi/include/linux/mmc/host.h
+--- linux-3.10.37/include/linux/mmc/host.h 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/include/linux/mmc/host.h 2014-04-24 15:35:04.797572727 +0200
@@ -281,6 +281,7 @@
#define MMC_CAP2_PACKED_CMD (MMC_CAP2_PACKED_RD | \
MMC_CAP2_PACKED_WR)
@@ -96980,9 +96983,9 @@ diff -Nur linux-3.10.36.orig/include/linux/mmc/host.h linux-3.10.36/include/linu
mmc_pm_flag_t pm_caps; /* supported pm features */
-diff -Nur linux-3.10.36.orig/include/linux/mmc/sdhci.h linux-3.10.36/include/linux/mmc/sdhci.h
---- linux-3.10.36.orig/include/linux/mmc/sdhci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/include/linux/mmc/sdhci.h 2014-04-13 17:33:19.000000000 +0200
+diff -Nur linux-3.10.37/include/linux/mmc/sdhci.h linux-rpi/include/linux/mmc/sdhci.h
+--- linux-3.10.37/include/linux/mmc/sdhci.h 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/include/linux/mmc/sdhci.h 2014-04-24 15:35:04.797572727 +0200
@@ -97,6 +97,7 @@
#define SDHCI_QUIRK2_PRESET_VALUE_BROKEN (1<<3)
@@ -97007,9 +97010,9 @@ diff -Nur linux-3.10.36.orig/include/linux/mmc/sdhci.h linux-3.10.36/include/lin
struct mmc_data *data; /* Current data request */
unsigned int data_early:1; /* Data finished before cmd */
-diff -Nur linux-3.10.36.orig/include/sound/soc-dai.h linux-3.10.36/include/sound/soc-dai.h
---- linux-3.10.36.orig/include/sound/soc-dai.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/include/sound/soc-dai.h 2014-04-13 17:33:21.000000000 +0200
+diff -Nur linux-3.10.37/include/sound/soc-dai.h linux-rpi/include/sound/soc-dai.h
+--- linux-3.10.37/include/sound/soc-dai.h 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/include/sound/soc-dai.h 2014-04-24 15:35:04.921574108 +0200
@@ -105,6 +105,8 @@
int snd_soc_dai_set_pll(struct snd_soc_dai *dai,
int pll_id, int source, unsigned int freq_in, unsigned int freq_out);
@@ -97027,9 +97030,9 @@ diff -Nur linux-3.10.36.orig/include/sound/soc-dai.h linux-3.10.36/include/sound
/*
* DAI format configuration
-diff -Nur linux-3.10.36.orig/include/uapi/linux/fb.h linux-3.10.36/include/uapi/linux/fb.h
---- linux-3.10.36.orig/include/uapi/linux/fb.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/include/uapi/linux/fb.h 2014-04-13 17:33:21.000000000 +0200
+diff -Nur linux-3.10.37/include/uapi/linux/fb.h linux-rpi/include/uapi/linux/fb.h
+--- linux-3.10.37/include/uapi/linux/fb.h 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/include/uapi/linux/fb.h 2014-04-24 15:35:04.941574330 +0200
@@ -34,6 +34,11 @@
#define FBIOPUT_MODEINFO 0x4617
#define FBIOGET_DISPINFO 0x4618
@@ -97042,9 +97045,9 @@ diff -Nur linux-3.10.36.orig/include/uapi/linux/fb.h linux-3.10.36/include/uapi/
#define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */
#define FB_TYPE_PLANES 1 /* Non interleaved planes */
-diff -Nur linux-3.10.36.orig/kernel/cgroup.c linux-3.10.36/kernel/cgroup.c
---- linux-3.10.36.orig/kernel/cgroup.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/kernel/cgroup.c 2014-04-13 17:33:22.000000000 +0200
+diff -Nur linux-3.10.37/kernel/cgroup.c linux-rpi/kernel/cgroup.c
+--- linux-3.10.37/kernel/cgroup.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/kernel/cgroup.c 2014-04-24 15:35:05.001574999 +0200
@@ -5127,6 +5127,37 @@
}
__setup("cgroup_disable=", cgroup_disable);
@@ -97083,9 +97086,9 @@ diff -Nur linux-3.10.36.orig/kernel/cgroup.c linux-3.10.36/kernel/cgroup.c
/*
* Functons for CSS ID.
*/
-diff -Nur linux-3.10.36.orig/mm/memcontrol.c linux-3.10.36/mm/memcontrol.c
---- linux-3.10.36.orig/mm/memcontrol.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/mm/memcontrol.c 2014-04-13 17:33:23.000000000 +0200
+diff -Nur linux-3.10.37/mm/memcontrol.c linux-rpi/mm/memcontrol.c
+--- linux-3.10.37/mm/memcontrol.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/mm/memcontrol.c 2014-04-24 15:35:05.077575846 +0200
@@ -6970,6 +6970,7 @@
.base_cftypes = mem_cgroup_files,
.early_init = 0,
@@ -97094,9 +97097,9 @@ diff -Nur linux-3.10.36.orig/mm/memcontrol.c linux-3.10.36/mm/memcontrol.c
};
#ifdef CONFIG_MEMCG_SWAP
-diff -Nur linux-3.10.36.orig/sound/arm/bcm2835.c linux-3.10.36/sound/arm/bcm2835.c
---- linux-3.10.36.orig/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/arm/bcm2835.c 2014-04-13 17:33:26.000000000 +0200
+diff -Nur linux-3.10.37/sound/arm/bcm2835.c linux-rpi/sound/arm/bcm2835.c
+--- linux-3.10.37/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/arm/bcm2835.c 2014-04-24 15:35:05.361579008 +0200
@@ -0,0 +1,413 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -97511,9 +97514,9 @@ diff -Nur linux-3.10.36.orig/sound/arm/bcm2835.c linux-3.10.36/sound/arm/bcm2835
+MODULE_DESCRIPTION("Alsa driver for BCM2835 chip");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:bcm2835_alsa");
-diff -Nur linux-3.10.36.orig/sound/arm/bcm2835-ctl.c linux-3.10.36/sound/arm/bcm2835-ctl.c
---- linux-3.10.36.orig/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/arm/bcm2835-ctl.c 2014-04-13 17:33:26.000000000 +0200
+diff -Nur linux-3.10.37/sound/arm/bcm2835-ctl.c linux-rpi/sound/arm/bcm2835-ctl.c
+--- linux-3.10.37/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/arm/bcm2835-ctl.c 2014-04-24 15:35:05.361579008 +0200
@@ -0,0 +1,200 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -97715,9 +97718,9 @@ diff -Nur linux-3.10.36.orig/sound/arm/bcm2835-ctl.c linux-3.10.36/sound/arm/bcm
+ }
+ return 0;
+}
-diff -Nur linux-3.10.36.orig/sound/arm/bcm2835.h linux-3.10.36/sound/arm/bcm2835.h
---- linux-3.10.36.orig/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/arm/bcm2835.h 2014-04-13 17:33:26.000000000 +0200
+diff -Nur linux-3.10.37/sound/arm/bcm2835.h linux-rpi/sound/arm/bcm2835.h
+--- linux-3.10.37/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/arm/bcm2835.h 2014-04-24 15:35:05.365579053 +0200
@@ -0,0 +1,157 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -97876,9 +97879,9 @@ diff -Nur linux-3.10.36.orig/sound/arm/bcm2835.h linux-3.10.36/sound/arm/bcm2835
+void bcm2835_audio_flush_playback_buffers(bcm2835_alsa_stream_t * alsa_stream);
+
+#endif /* __SOUND_ARM_BCM2835_H */
-diff -Nur linux-3.10.36.orig/sound/arm/bcm2835-pcm.c linux-3.10.36/sound/arm/bcm2835-pcm.c
---- linux-3.10.36.orig/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/arm/bcm2835-pcm.c 2014-04-13 17:33:26.000000000 +0200
+diff -Nur linux-3.10.37/sound/arm/bcm2835-pcm.c linux-rpi/sound/arm/bcm2835-pcm.c
+--- linux-3.10.37/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/arm/bcm2835-pcm.c 2014-04-24 15:35:05.361579008 +0200
@@ -0,0 +1,426 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -98306,9 +98309,9 @@ diff -Nur linux-3.10.36.orig/sound/arm/bcm2835-pcm.c linux-3.10.36/sound/arm/bcm
+
+ return 0;
+}
-diff -Nur linux-3.10.36.orig/sound/arm/bcm2835-vchiq.c linux-3.10.36/sound/arm/bcm2835-vchiq.c
---- linux-3.10.36.orig/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/arm/bcm2835-vchiq.c 2014-04-13 17:33:26.000000000 +0200
+diff -Nur linux-3.10.37/sound/arm/bcm2835-vchiq.c linux-rpi/sound/arm/bcm2835-vchiq.c
+--- linux-3.10.37/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/arm/bcm2835-vchiq.c 2014-04-24 15:35:05.361579008 +0200
@@ -0,0 +1,879 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -99189,9 +99192,9 @@ diff -Nur linux-3.10.36.orig/sound/arm/bcm2835-vchiq.c linux-3.10.36/sound/arm/b
+
+module_param(force_bulk, bool, 0444);
+MODULE_PARM_DESC(force_bulk, "Force use of vchiq bulk for audio");
-diff -Nur linux-3.10.36.orig/sound/arm/Kconfig linux-3.10.36/sound/arm/Kconfig
---- linux-3.10.36.orig/sound/arm/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/sound/arm/Kconfig 2014-04-13 17:33:26.000000000 +0200
+diff -Nur linux-3.10.37/sound/arm/Kconfig linux-rpi/sound/arm/Kconfig
+--- linux-3.10.37/sound/arm/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/sound/arm/Kconfig 2014-04-24 15:35:05.357578964 +0200
@@ -39,5 +39,12 @@
Say Y or M if you want to support any AC97 codec attached to
the PXA2xx AC97 interface.
@@ -99205,9 +99208,9 @@ diff -Nur linux-3.10.36.orig/sound/arm/Kconfig linux-3.10.36/sound/arm/Kconfig
+
endif # SND_ARM
-diff -Nur linux-3.10.36.orig/sound/arm/Makefile linux-3.10.36/sound/arm/Makefile
---- linux-3.10.36.orig/sound/arm/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/sound/arm/Makefile 2014-04-13 17:33:26.000000000 +0200
+diff -Nur linux-3.10.37/sound/arm/Makefile linux-rpi/sound/arm/Makefile
+--- linux-3.10.37/sound/arm/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/sound/arm/Makefile 2014-04-24 15:35:05.357578964 +0200
@@ -14,3 +14,9 @@
obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o
@@ -99218,9 +99221,9 @@ diff -Nur linux-3.10.36.orig/sound/arm/Makefile linux-3.10.36/sound/arm/Makefile
+
+ccflags-y += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000
+
-diff -Nur linux-3.10.36.orig/sound/arm/vc_vchi_audioserv_defs.h linux-3.10.36/sound/arm/vc_vchi_audioserv_defs.h
---- linux-3.10.36.orig/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/arm/vc_vchi_audioserv_defs.h 2014-04-13 17:33:26.000000000 +0200
+diff -Nur linux-3.10.37/sound/arm/vc_vchi_audioserv_defs.h linux-rpi/sound/arm/vc_vchi_audioserv_defs.h
+--- linux-3.10.37/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/arm/vc_vchi_audioserv_defs.h 2014-04-24 15:35:05.365579053 +0200
@@ -0,0 +1,116 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -99338,9 +99341,9 @@ diff -Nur linux-3.10.36.orig/sound/arm/vc_vchi_audioserv_defs.h linux-3.10.36/so
+} VC_AUDIO_MSG_T;
+
+#endif // _VC_AUDIO_DEFS_H_
-diff -Nur linux-3.10.36.orig/sound/soc/bcm/bcm2708-i2s.c linux-3.10.36/sound/soc/bcm/bcm2708-i2s.c
---- linux-3.10.36.orig/sound/soc/bcm/bcm2708-i2s.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/soc/bcm/bcm2708-i2s.c 2014-04-13 17:33:28.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/bcm/bcm2708-i2s.c linux-rpi/sound/soc/bcm/bcm2708-i2s.c
+--- linux-3.10.37/sound/soc/bcm/bcm2708-i2s.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/bcm/bcm2708-i2s.c 2014-04-24 15:35:05.481580345 +0200
@@ -0,0 +1,945 @@
+/*
+ * ALSA SoC I2S Audio Layer for Broadcom BCM2708 SoC
@@ -100287,9 +100290,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/bcm/bcm2708-i2s.c linux-3.10.36/sound/soc
+MODULE_DESCRIPTION("BCM2708 I2S interface");
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36.orig/sound/soc/bcm/hifiberry_dac.c linux-3.10.36/sound/soc/bcm/hifiberry_dac.c
---- linux-3.10.36.orig/sound/soc/bcm/hifiberry_dac.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/soc/bcm/hifiberry_dac.c 2014-04-13 17:33:28.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/bcm/hifiberry_dac.c linux-rpi/sound/soc/bcm/hifiberry_dac.c
+--- linux-3.10.37/sound/soc/bcm/hifiberry_dac.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/bcm/hifiberry_dac.c 2014-04-24 15:35:05.481580345 +0200
@@ -0,0 +1,100 @@
+/*
+ * ASoC Driver for HifiBerry DAC
@@ -100391,9 +100394,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/bcm/hifiberry_dac.c linux-3.10.36/sound/s
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_DESCRIPTION("ASoC Driver for HifiBerry DAC");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36.orig/sound/soc/bcm/hifiberry_digi.c linux-3.10.36/sound/soc/bcm/hifiberry_digi.c
---- linux-3.10.36.orig/sound/soc/bcm/hifiberry_digi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/soc/bcm/hifiberry_digi.c 2014-04-13 17:33:28.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/bcm/hifiberry_digi.c linux-rpi/sound/soc/bcm/hifiberry_digi.c
+--- linux-3.10.37/sound/soc/bcm/hifiberry_digi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/bcm/hifiberry_digi.c 2014-04-24 15:35:05.481580345 +0200
@@ -0,0 +1,153 @@
+/*
+ * ASoC Driver for HifiBerry Digi
@@ -100548,9 +100551,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/bcm/hifiberry_digi.c linux-3.10.36/sound/
+MODULE_AUTHOR("Daniel Matuschek <info@crazy-audio.com>");
+MODULE_DESCRIPTION("ASoC Driver for HifiBerry Digi");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36.orig/sound/soc/bcm/iqaudio-dac.c linux-3.10.36/sound/soc/bcm/iqaudio-dac.c
---- linux-3.10.36.orig/sound/soc/bcm/iqaudio-dac.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/soc/bcm/iqaudio-dac.c 2014-04-13 17:33:28.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/bcm/iqaudio-dac.c linux-rpi/sound/soc/bcm/iqaudio-dac.c
+--- linux-3.10.37/sound/soc/bcm/iqaudio-dac.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/bcm/iqaudio-dac.c 2014-04-24 15:35:05.481580345 +0200
@@ -0,0 +1,111 @@
+/*
+ * ASoC Driver for IQaudIO DAC
@@ -100663,9 +100666,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/bcm/iqaudio-dac.c linux-3.10.36/sound/soc
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_DESCRIPTION("ASoC Driver for IQAudio DAC");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36.orig/sound/soc/bcm/Kconfig linux-3.10.36/sound/soc/bcm/Kconfig
---- linux-3.10.36.orig/sound/soc/bcm/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/soc/bcm/Kconfig 2014-04-13 17:33:28.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/bcm/Kconfig linux-rpi/sound/soc/bcm/Kconfig
+--- linux-3.10.37/sound/soc/bcm/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/bcm/Kconfig 2014-04-24 15:35:05.481580345 +0200
@@ -0,0 +1,38 @@
+config SND_BCM2708_SOC_I2S
+ tristate "SoC Audio support for the Broadcom BCM2708 I2S module"
@@ -100705,9 +100708,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/bcm/Kconfig linux-3.10.36/sound/soc/bcm/K
+ select SND_SOC_PCM512x
+ help
+ Say Y or M if you want to add support for IQaudIO-DAC.
-diff -Nur linux-3.10.36.orig/sound/soc/bcm/Makefile linux-3.10.36/sound/soc/bcm/Makefile
---- linux-3.10.36.orig/sound/soc/bcm/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/soc/bcm/Makefile 2014-04-13 17:33:28.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/bcm/Makefile linux-rpi/sound/soc/bcm/Makefile
+--- linux-3.10.37/sound/soc/bcm/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/bcm/Makefile 2014-04-24 15:35:05.481580345 +0200
@@ -0,0 +1,16 @@
+# BCM2708 Platform Support
+snd-soc-bcm2708-i2s-objs := bcm2708-i2s.o
@@ -100725,9 +100728,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/bcm/Makefile linux-3.10.36/sound/soc/bcm/
+obj-$(CONFIG_SND_BCM2708_SOC_RPI_DAC) += snd-soc-rpi-dac.o
+obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o
+
-diff -Nur linux-3.10.36.orig/sound/soc/bcm/rpi-dac.c linux-3.10.36/sound/soc/bcm/rpi-dac.c
---- linux-3.10.36.orig/sound/soc/bcm/rpi-dac.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/soc/bcm/rpi-dac.c 2014-04-13 17:33:28.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/bcm/rpi-dac.c linux-rpi/sound/soc/bcm/rpi-dac.c
+--- linux-3.10.37/sound/soc/bcm/rpi-dac.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/bcm/rpi-dac.c 2014-04-24 15:35:05.481580345 +0200
@@ -0,0 +1,97 @@
+/*
+ * ASoC Driver for RPi-DAC.
@@ -100826,9 +100829,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/bcm/rpi-dac.c linux-3.10.36/sound/soc/bcm
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_DESCRIPTION("ASoC Driver for RPi-DAC");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36.orig/sound/soc/codecs/Kconfig linux-3.10.36/sound/soc/codecs/Kconfig
---- linux-3.10.36.orig/sound/soc/codecs/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/sound/soc/codecs/Kconfig 2014-04-13 17:33:28.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/codecs/Kconfig linux-rpi/sound/soc/codecs/Kconfig
+--- linux-3.10.37/sound/soc/codecs/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/sound/soc/codecs/Kconfig 2014-04-24 15:35:05.481580345 +0200
@@ -55,6 +55,9 @@
select SND_SOC_ML26124 if I2C
select SND_SOC_OMAP_HDMI_CODEC if OMAP4_DSS_HDMI
@@ -100855,9 +100858,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/codecs/Kconfig linux-3.10.36/sound/soc/co
config SND_SOC_RT5631
tristate
-diff -Nur linux-3.10.36.orig/sound/soc/codecs/Makefile linux-3.10.36/sound/soc/codecs/Makefile
---- linux-3.10.36.orig/sound/soc/codecs/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/sound/soc/codecs/Makefile 2014-04-13 17:33:28.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/codecs/Makefile linux-rpi/sound/soc/codecs/Makefile
+--- linux-3.10.37/sound/soc/codecs/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/sound/soc/codecs/Makefile 2014-04-24 15:35:05.481580345 +0200
@@ -43,6 +43,9 @@
snd-soc-ml26124-objs := ml26124.o
snd-soc-omap-hdmi-codec-objs := omap-hdmi.o
@@ -100878,9 +100881,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/codecs/Makefile linux-3.10.36/sound/soc/c
obj-$(CONFIG_SND_SOC_RT5631) += snd-soc-rt5631.o
obj-$(CONFIG_SND_SOC_SGTL5000) += snd-soc-sgtl5000.o
obj-$(CONFIG_SND_SOC_SIGMADSP) += snd-soc-sigmadsp.o
-diff -Nur linux-3.10.36.orig/sound/soc/codecs/pcm1794a.c linux-3.10.36/sound/soc/codecs/pcm1794a.c
---- linux-3.10.36.orig/sound/soc/codecs/pcm1794a.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/soc/codecs/pcm1794a.c 2014-04-13 17:33:29.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/codecs/pcm1794a.c linux-rpi/sound/soc/codecs/pcm1794a.c
+--- linux-3.10.37/sound/soc/codecs/pcm1794a.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/codecs/pcm1794a.c 2014-04-24 15:35:05.493580478 +0200
@@ -0,0 +1,62 @@
+/*
+ * Driver for the PCM1794A codec
@@ -100944,9 +100947,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/codecs/pcm1794a.c linux-3.10.36/sound/soc
+MODULE_DESCRIPTION("ASoC PCM1794A codec driver");
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36.orig/sound/soc/codecs/pcm5102a.c linux-3.10.36/sound/soc/codecs/pcm5102a.c
---- linux-3.10.36.orig/sound/soc/codecs/pcm5102a.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/soc/codecs/pcm5102a.c 2014-04-13 17:33:29.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/codecs/pcm5102a.c linux-rpi/sound/soc/codecs/pcm5102a.c
+--- linux-3.10.37/sound/soc/codecs/pcm5102a.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/codecs/pcm5102a.c 2014-04-24 15:35:05.493580478 +0200
@@ -0,0 +1,63 @@
+/*
+ * Driver for the PCM5102A codec
@@ -101011,9 +101014,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/codecs/pcm5102a.c linux-3.10.36/sound/soc
+MODULE_DESCRIPTION("ASoC PCM5102A codec driver");
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36.orig/sound/soc/codecs/pcm512x.c linux-3.10.36/sound/soc/codecs/pcm512x.c
---- linux-3.10.36.orig/sound/soc/codecs/pcm512x.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/soc/codecs/pcm512x.c 2014-04-13 17:33:29.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/codecs/pcm512x.c linux-rpi/sound/soc/codecs/pcm512x.c
+--- linux-3.10.37/sound/soc/codecs/pcm512x.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/codecs/pcm512x.c 2014-04-24 15:35:05.493580478 +0200
@@ -0,0 +1,678 @@
+/*
+ * Driver for the PCM512x CODECs
@@ -101693,9 +101696,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/codecs/pcm512x.c linux-3.10.36/sound/soc/
+MODULE_DESCRIPTION("ASoC PCM512x codec driver");
+MODULE_AUTHOR("Mark Brown <broonie@linaro.org>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36.orig/sound/soc/codecs/pcm512x.h linux-3.10.36/sound/soc/codecs/pcm512x.h
---- linux-3.10.36.orig/sound/soc/codecs/pcm512x.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.36/sound/soc/codecs/pcm512x.h 2014-04-13 17:33:29.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/codecs/pcm512x.h linux-rpi/sound/soc/codecs/pcm512x.h
+--- linux-3.10.37/sound/soc/codecs/pcm512x.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/codecs/pcm512x.h 2014-04-24 15:35:05.493580478 +0200
@@ -0,0 +1,142 @@
+/*
+ * Driver for the PCM512x CODECs
@@ -101839,9 +101842,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/codecs/pcm512x.h linux-3.10.36/sound/soc/
+#define PCM512x_AMLR_SHIFT 0
+
+#endif
-diff -Nur linux-3.10.36.orig/sound/soc/codecs/wm8804.c linux-3.10.36/sound/soc/codecs/wm8804.c
---- linux-3.10.36.orig/sound/soc/codecs/wm8804.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/sound/soc/codecs/wm8804.c 2014-04-13 17:33:29.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/codecs/wm8804.c linux-rpi/sound/soc/codecs/wm8804.c
+--- linux-3.10.37/sound/soc/codecs/wm8804.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/sound/soc/codecs/wm8804.c 2014-04-24 15:35:05.509580657 +0200
@@ -63,6 +63,7 @@
struct regmap *regmap;
struct regulator_bulk_data supplies[WM8804_NUM_SUPPLIES];
@@ -101927,9 +101930,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/codecs/wm8804.c linux-3.10.36/sound/soc/c
.controls = wm8804_snd_controls,
.num_controls = ARRAY_SIZE(wm8804_snd_controls),
-diff -Nur linux-3.10.36.orig/sound/soc/codecs/wm8804.h linux-3.10.36/sound/soc/codecs/wm8804.h
---- linux-3.10.36.orig/sound/soc/codecs/wm8804.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/sound/soc/codecs/wm8804.h 2014-04-13 17:33:29.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/codecs/wm8804.h linux-rpi/sound/soc/codecs/wm8804.h
+--- linux-3.10.37/sound/soc/codecs/wm8804.h 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/sound/soc/codecs/wm8804.h 2014-04-24 15:35:05.509580657 +0200
@@ -57,5 +57,9 @@
#define WM8804_CLKOUT_SRC_OSCCLK 4
@@ -101940,9 +101943,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/codecs/wm8804.h linux-3.10.36/sound/soc/c
+#define WM8804_MCLKDIV_128FS 1
#endif /* _WM8804_H */
-diff -Nur linux-3.10.36.orig/sound/soc/Kconfig linux-3.10.36/sound/soc/Kconfig
---- linux-3.10.36.orig/sound/soc/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/sound/soc/Kconfig 2014-04-13 17:33:28.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/Kconfig linux-rpi/sound/soc/Kconfig
+--- linux-3.10.37/sound/soc/Kconfig 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/sound/soc/Kconfig 2014-04-24 15:35:05.477580300 +0200
@@ -36,6 +36,7 @@
# All the supported SoCs
source "sound/soc/atmel/Kconfig"
@@ -101951,9 +101954,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/Kconfig linux-3.10.36/sound/soc/Kconfig
source "sound/soc/blackfin/Kconfig"
source "sound/soc/cirrus/Kconfig"
source "sound/soc/davinci/Kconfig"
-diff -Nur linux-3.10.36.orig/sound/soc/Makefile linux-3.10.36/sound/soc/Makefile
---- linux-3.10.36.orig/sound/soc/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/sound/soc/Makefile 2014-04-13 17:33:28.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/Makefile linux-rpi/sound/soc/Makefile
+--- linux-3.10.37/sound/soc/Makefile 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/sound/soc/Makefile 2014-04-24 15:35:05.477580300 +0200
@@ -14,6 +14,7 @@
obj-$(CONFIG_SND_SOC) += generic/
obj-$(CONFIG_SND_SOC) += atmel/
@@ -101962,9 +101965,9 @@ diff -Nur linux-3.10.36.orig/sound/soc/Makefile linux-3.10.36/sound/soc/Makefile
obj-$(CONFIG_SND_SOC) += blackfin/
obj-$(CONFIG_SND_SOC) += cirrus/
obj-$(CONFIG_SND_SOC) += davinci/
-diff -Nur linux-3.10.36.orig/sound/soc/soc-core.c linux-3.10.36/sound/soc/soc-core.c
---- linux-3.10.36.orig/sound/soc/soc-core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/sound/soc/soc-core.c 2014-04-13 17:33:29.000000000 +0200
+diff -Nur linux-3.10.37/sound/soc/soc-core.c linux-rpi/sound/soc/soc-core.c
+--- linux-3.10.37/sound/soc/soc-core.c 2014-04-14 15:42:31.000000000 +0200
++++ linux-rpi/sound/soc/soc-core.c 2014-04-24 15:35:05.545581058 +0200
@@ -2925,8 +2925,8 @@
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index 019c5890c..7a91fa9e9 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -37,7 +37,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
config ADK_KPACKAGE_KMOD_FULL_NAT
tristate "Meta package for Full NAT"
select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_84
- select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_36
+ select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_37
select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10
select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_18
select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_11
@@ -55,7 +55,7 @@ config ADK_KPACKAGE_KMOD_NF_NAT
config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
tristate 'Full NAT'
depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
- depends on ADK_KERNEL_VERSION_3_10_36 \
+ depends on ADK_KERNEL_VERSION_3_10_37 \
|| ADK_KERNEL_VERSION_3_11_10 \
|| ADK_KERNEL_VERSION_3_12_18 \
|| ADK_KERNEL_VERSION_3_13_11 \
diff --git a/target/linux/patches/3.10.36/bsd-compatibility.patch b/target/linux/patches/3.10.37/bsd-compatibility.patch
index b954b658f..b954b658f 100644
--- a/target/linux/patches/3.10.36/bsd-compatibility.patch
+++ b/target/linux/patches/3.10.37/bsd-compatibility.patch
diff --git a/target/linux/patches/3.10.36/startup.patch b/target/linux/patches/3.10.37/startup.patch
index 3ebc5db1e..3ebc5db1e 100644
--- a/target/linux/patches/3.10.36/startup.patch
+++ b/target/linux/patches/3.10.37/startup.patch
diff --git a/toolchain/kernel-headers/patches/3.10.36/headers-install.patch b/toolchain/kernel-headers/patches/3.10.36/headers-install.patch
deleted file mode 100644
index de37bdafb..000000000
--- a/toolchain/kernel-headers/patches/3.10.36/headers-install.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -Nur linux-3.10.36.orig/scripts/headers_install.sh linux-3.10.36/scripts/headers_install.sh
---- linux-3.10.36.orig/scripts/headers_install.sh 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/scripts/headers_install.sh 2014-04-14 20:32:34.000000000 +0200
-@@ -2,7 +2,7 @@
-
- if [ $# -lt 1 ]
- then
-- echo "Usage: headers_install.sh OUTDIR [FILES...]
-+ echo "Usage: headers_install.sh OUTDIR SRCDIR [FILES...]
- echo
- echo "Prepares kernel header files for use by user space, by removing"
- echo "all compiler.h definitions and #includes, removing any"
-@@ -10,6 +10,7 @@
- echo "asm/inline/volatile keywords."
- echo
- echo "OUTDIR: directory to write each userspace header FILE to."
-+ echo "SRCDIR: source directory where files are picked."
- echo "FILES: list of header files to operate on."
-
- exit 1
-@@ -19,6 +20,8 @@
-
- OUTDIR="$1"
- shift
-+SRCDIR="$1"
-+shift
-
- # Iterate through files listed on command line
-
-@@ -34,7 +37,7 @@
- -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
- -e 's/(^|[ \t(])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \
- -e 's@#(ifndef|define|endif[ \t]*/[*])[ \t]*_UAPI@#\1 @' \
-- "$i" > "$OUTDIR/$FILE.sed" || exit 1
-+ "$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1
- scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \
- > "$OUTDIR/$FILE"
- [ $? -gt 1 ] && exit 1
-diff -Nur linux-3.10.36.orig/scripts/Makefile.headersinst linux-3.10.36/scripts/Makefile.headersinst
---- linux-3.10.36.orig/scripts/Makefile.headersinst 2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/scripts/Makefile.headersinst 2014-04-14 20:42:47.000000000 +0200
-@@ -47,18 +47,24 @@
- all-files := $(header-y) $(genhdr-y) $(wrapper-files)
- output-files := $(addprefix $(installdir)/, $(all-files))
-
--input-files := $(foreach hdr, $(header-y), \
-+input-files1 := $(foreach hdr, $(header-y), \
- $(if $(wildcard $(srcdir)/$(hdr)), \
-- $(wildcard $(srcdir)/$(hdr)), \
-+ $(wildcard $(srcdir)/$(hdr))) \
-+ )
-+input-files1-name := $(notdir $(input-files1))
-+input-files2 := $(foreach hdr, $(header-y), \
-+ $(if $(wildcard $(srcdir)/$(hdr)),, \
- $(if $(wildcard $(oldsrcdir)/$(hdr)), \
- $(wildcard $(oldsrcdir)/$(hdr)), \
- $(error Missing UAPI file $(srcdir)/$(hdr))) \
-- )) \
-- $(foreach hdr, $(genhdr-y), \
-+ ))
-+input-files2-name := $(notdir $(input-files2))
-+input-files3 := $(foreach hdr, $(genhdr-y), \
- $(if $(wildcard $(gendir)/$(hdr)), \
- $(wildcard $(gendir)/$(hdr)), \
- $(error Missing generated UAPI file $(gendir)/$(hdr)) \
- ))
-+input-files3-name := $(notdir $(input-files3))
-
- # Work out what needs to be removed
- oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h))
-@@ -72,7 +78,9 @@
- quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
- file$(if $(word 2, $(all-files)),s))
- cmd_install = \
-- $(CONFIG_SHELL) $< $(installdir) $(input-files); \
-+ $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \
-+ $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \
-+ $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \
- for F in $(wrapper-files); do \
- echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \
- done; \
-@@ -98,8 +106,7 @@
- @:
-
- targets += $(install-file)
--$(install-file): scripts/headers_install.sh $(input-files) FORCE
-- $(if $(unwanted),$(call cmd,remove),)
-+$(install-file): scripts/headers_install.sh $(input-files1) $(input-files2) $(input-files3) FORCE
- $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
- $(call if_changed,install)
-
diff --git a/toolchain/kernel-headers/patches/3.10.37/headers-install.patch b/toolchain/kernel-headers/patches/3.10.37/headers-install.patch
new file mode 100644
index 000000000..46dc9fe13
--- /dev/null
+++ b/toolchain/kernel-headers/patches/3.10.37/headers-install.patch
@@ -0,0 +1,11 @@
+diff -Nur linux-3.10.37.orig/scripts/Makefile.headersinst linux-3.10.37/scripts/Makefile.headersinst
+--- linux-3.10.37.orig/scripts/Makefile.headersinst 2014-04-14 15:42:31.000000000 +0200
++++ linux-3.10.37/scripts/Makefile.headersinst 2014-04-24 17:04:51.980248954 +0200
+@@ -107,7 +107,6 @@
+
+ targets += $(install-file)
+ $(install-file): scripts/headers_install.sh $(input-files1) $(input-files2) $(input-files3) FORCE
+- $(if $(unwanted),$(call cmd,remove),)
+ $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
+ $(call if_changed,install)
+
diff --git a/toolchain/kernel-headers/patches/3.10.36/mkpiggy.patch b/toolchain/kernel-headers/patches/3.10.37/mkpiggy.patch
index d4e815cd2..d4e815cd2 100644
--- a/toolchain/kernel-headers/patches/3.10.36/mkpiggy.patch
+++ b/toolchain/kernel-headers/patches/3.10.37/mkpiggy.patch
diff --git a/toolchain/kernel-headers/patches/3.10.36/relocs.patch b/toolchain/kernel-headers/patches/3.10.37/relocs.patch
index 649b9e73e..649b9e73e 100644
--- a/toolchain/kernel-headers/patches/3.10.36/relocs.patch
+++ b/toolchain/kernel-headers/patches/3.10.37/relocs.patch
diff --git a/toolchain/kernel-headers/patches/3.10.36/sgidefs.patch b/toolchain/kernel-headers/patches/3.10.37/sgidefs.patch
index f00a284d9..f00a284d9 100644
--- a/toolchain/kernel-headers/patches/3.10.36/sgidefs.patch
+++ b/toolchain/kernel-headers/patches/3.10.37/sgidefs.patch
diff --git a/toolchain/kernel-headers/patches/3.10.36/sortext.patch b/toolchain/kernel-headers/patches/3.10.37/sortext.patch
index 65bbbb64b..65bbbb64b 100644
--- a/toolchain/kernel-headers/patches/3.10.36/sortext.patch
+++ b/toolchain/kernel-headers/patches/3.10.37/sortext.patch