kernel: update to latest version

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
author: Michael Olbrich <m.olbrich@pengutronix.de> 2012-12-17 23:04:49 +0100
committer: Michael Olbrich <m.olbrich@pengutronix.de> 2012-12-17 23:04:49 +0100
commit: ca936e7bb48e28b5d6c281135d336570131c224b (patch)
tree: 95cb04bb9edce43992b8ccce978a448a254ad7e2
parent: 82123838fa8885ad1d6994792841896ed9c08e23 (diff)
download: platform-pengutronix-raspberrypi-ca936e7bb48e28b5d6c281135d336570131c224b.tar.gz
platform-pengutronix-raspberrypi-ca936e7bb48e28b5d6c281135d336570131c224b.tar.xz
198 files changed, 4421 insertions, 89 deletions
diff --git a/kernelconfig-3.6.7 b/kernelconfig-3.6.10
index 1cf2e4f..75e7758 100644
--- a/kernelconfig-3.6.7
+++ b/kernelconfig-3.6.10
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.6.7-20121120 Kernel Configuration
+# Linux/arm 3.6.10-20121217 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1039,7 +1039,7 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_GENERIC_CPU_DEVICES is not set
 # CONFIG_DMA_SHARED_BUFFER is not set
 CONFIG_CMA=y
-CONFIG_CMA_DEBUG=y
+# CONFIG_CMA_DEBUG is not set
 
 #
 # Default contiguous memory area size:
diff --git a/patches/linux-3.6.7/0001-Add-dwc_otg-driver.patch b/patches/linux-3.6.10/0001-Add-dwc_otg-driver.patch
index 5bd8795..5bd8795 100644
--- a/patches/linux-3.6.7/0001-Add-dwc_otg-driver.patch
+++ b/patches/linux-3.6.10/0001-Add-dwc_otg-driver.patch
diff --git a/patches/linux-3.6.7/0002-Main-bcm2708-linux-port.patch b/patches/linux-3.6.10/0002-Main-bcm2708-linux-port.patch
index 778dff6..dae8b43 100644
--- a/patches/linux-3.6.7/0002-Main-bcm2708-linux-port.patch
+++ b/patches/linux-3.6.10/0002-Main-bcm2708-linux-port.patch
@@ -109,10 +109,10 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  create mode 100644 drivers/mmc/host/sdhci-bcm2708.c
 
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 48c19d4..fd48798 100644
+index 589bdba..a8a38ab 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -998,6 +998,19 @@ config PLAT_SPEAR
+@@ -999,6 +999,19 @@ config PLAT_SPEAR
  	help
  	  Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx).
  
@@ -132,7 +132,7 @@ index 48c19d4..fd48798 100644
  config ARCH_VT8500
  	bool "VIA/WonderMedia 85xx"
  	select CPU_ARM926T
-@@ -1132,6 +1145,7 @@ source "arch/arm/plat-versatile/Kconfig"
+@@ -1133,6 +1146,7 @@ source "arch/arm/plat-versatile/Kconfig"
  source "arch/arm/mach-vt8500/Kconfig"
  
  source "arch/arm/mach-w90x900/Kconfig"
diff --git a/patches/linux-3.6.7/0003-bcm2708-watchdog-driver.patch b/patches/linux-3.6.10/0003-bcm2708-watchdog-driver.patch
index b537702..b537702 100644
--- a/patches/linux-3.6.7/0003-bcm2708-watchdog-driver.patch
+++ b/patches/linux-3.6.10/0003-bcm2708-watchdog-driver.patch
diff --git a/patches/linux-3.6.7/0004-bcm2708-framebuffer-driver.patch b/patches/linux-3.6.10/0004-bcm2708-framebuffer-driver.patch
index f3ebda7..f3ebda7 100644
--- a/patches/linux-3.6.7/0004-bcm2708-framebuffer-driver.patch
+++ b/patches/linux-3.6.10/0004-bcm2708-framebuffer-driver.patch
diff --git a/patches/linux-3.6.7/0005-bcm2708-vchiq-driver.patch b/patches/linux-3.6.10/0005-bcm2708-vchiq-driver.patch
index 08016e9..08016e9 100644
--- a/patches/linux-3.6.7/0005-bcm2708-vchiq-driver.patch
+++ b/patches/linux-3.6.10/0005-bcm2708-vchiq-driver.patch
diff --git a/patches/linux-3.6.7/0006-Allow-mac-address-to-be-set-in-smsc95xx.patch b/patches/linux-3.6.10/0006-Allow-mac-address-to-be-set-in-smsc95xx.patch
index 2db0750..2db0750 100644
--- a/patches/linux-3.6.7/0006-Allow-mac-address-to-be-set-in-smsc95xx.patch
+++ b/patches/linux-3.6.10/0006-Allow-mac-address-to-be-set-in-smsc95xx.patch
diff --git a/patches/linux-3.6.7/0007-Fix-headers-for-vchiq-vcos-to-be-GPLv2.patch b/patches/linux-3.6.10/0007-Fix-headers-for-vchiq-vcos-to-be-GPLv2.patch
index f38c111..f38c111 100644
--- a/patches/linux-3.6.7/0007-Fix-headers-for-vchiq-vcos-to-be-GPLv2.patch
+++ b/patches/linux-3.6.10/0007-Fix-headers-for-vchiq-vcos-to-be-GPLv2.patch
diff --git a/patches/linux-3.6.7/0008-Fix-some-issues-reported.-Lower-case-module-paramete.patch b/patches/linux-3.6.10/0008-Fix-some-issues-reported.-Lower-case-module-paramete.patch
index 62a9aa4..62a9aa4 100644
--- a/patches/linux-3.6.7/0008-Fix-some-issues-reported.-Lower-case-module-paramete.patch
+++ b/patches/linux-3.6.10/0008-Fix-some-issues-reported.-Lower-case-module-paramete.patch
diff --git a/patches/linux-3.6.7/0009-Build-anything-reasonable-as-a-module.-Thanks-to-asb.patch b/patches/linux-3.6.10/0009-Build-anything-reasonable-as-a-module.-Thanks-to-asb.patch
index 9c338c6..9c338c6 100644
--- a/patches/linux-3.6.7/0009-Build-anything-reasonable-as-a-module.-Thanks-to-asb.patch
+++ b/patches/linux-3.6.10/0009-Build-anything-reasonable-as-a-module.-Thanks-to-asb.patch
diff --git a/patches/linux-3.6.7/0010-Add-config-option-to-enable-L2-cache.patch b/patches/linux-3.6.10/0010-Add-config-option-to-enable-L2-cache.patch
index 256685d..256685d 100644
--- a/patches/linux-3.6.7/0010-Add-config-option-to-enable-L2-cache.patch
+++ b/patches/linux-3.6.10/0010-Add-config-option-to-enable-L2-cache.patch
diff --git a/patches/linux-3.6.7/0011-Fix-bug-where-vchiq-fails-when-L2-enabled.patch b/patches/linux-3.6.10/0011-Fix-bug-where-vchiq-fails-when-L2-enabled.patch
index cb2633d..cb2633d 100644
--- a/patches/linux-3.6.7/0011-Fix-bug-where-vchiq-fails-when-L2-enabled.patch
+++ b/patches/linux-3.6.10/0011-Fix-bug-where-vchiq-fails-when-L2-enabled.patch
diff --git a/patches/linux-3.6.7/0012-Add-devtmpfs-for-archlinux-and-emergency-and-debug-c.patch b/patches/linux-3.6.10/0012-Add-devtmpfs-for-archlinux-and-emergency-and-debug-c.patch
index f20f0f5..f20f0f5 100644
--- a/patches/linux-3.6.7/0012-Add-devtmpfs-for-archlinux-and-emergency-and-debug-c.patch
+++ b/patches/linux-3.6.10/0012-Add-devtmpfs-for-archlinux-and-emergency-and-debug-c.patch
diff --git a/patches/linux-3.6.7/0013-Fix-32bpp-framebuffer-by-adding-alpha-bits.patch b/patches/linux-3.6.10/0013-Fix-32bpp-framebuffer-by-adding-alpha-bits.patch
index a8a0dee..a8a0dee 100644
--- a/patches/linux-3.6.7/0013-Fix-32bpp-framebuffer-by-adding-alpha-bits.patch
+++ b/patches/linux-3.6.10/0013-Fix-32bpp-framebuffer-by-adding-alpha-bits.patch
diff --git a/patches/linux-3.6.7/0014-Enable-L2-cache-is-now-the-default.-Invert-sense-of-.patch b/patches/linux-3.6.10/0014-Enable-L2-cache-is-now-the-default.-Invert-sense-of-.patch
index 597feb1..597feb1 100644
--- a/patches/linux-3.6.7/0014-Enable-L2-cache-is-now-the-default.-Invert-sense-of-.patch
+++ b/patches/linux-3.6.10/0014-Enable-L2-cache-is-now-the-default.-Invert-sense-of-.patch
diff --git a/patches/linux-3.6.7/0015-Allow-24bpp-for-framebuffer.patch b/patches/linux-3.6.10/0015-Allow-24bpp-for-framebuffer.patch
index ed3cdb3..ed3cdb3 100644
--- a/patches/linux-3.6.7/0015-Allow-24bpp-for-framebuffer.patch
+++ b/patches/linux-3.6.10/0015-Allow-24bpp-for-framebuffer.patch
diff --git a/patches/linux-3.6.7/0016-Disable-debug-code-in-dwc_otg-driver-unless-CONFIG_U.patch b/patches/linux-3.6.10/0016-Disable-debug-code-in-dwc_otg-driver-unless-CONFIG_U.patch
index 072f2e6..072f2e6 100644
--- a/patches/linux-3.6.7/0016-Disable-debug-code-in-dwc_otg-driver-unless-CONFIG_U.patch
+++ b/patches/linux-3.6.10/0016-Disable-debug-code-in-dwc_otg-driver-unless-CONFIG_U.patch
diff --git a/patches/linux-3.6.7/0017-Enable-high-resolution-timers.patch b/patches/linux-3.6.10/0017-Enable-high-resolution-timers.patch
index 087cd48..087cd48 100644
--- a/patches/linux-3.6.7/0017-Enable-high-resolution-timers.patch
+++ b/patches/linux-3.6.10/0017-Enable-high-resolution-timers.patch
diff --git a/patches/linux-3.6.7/0018-Fix-for-mmc-timeouts-when-erasing-multiple-blocks.patch b/patches/linux-3.6.10/0018-Fix-for-mmc-timeouts-when-erasing-multiple-blocks.patch
index c87441b..c87441b 100644
--- a/patches/linux-3.6.7/0018-Fix-for-mmc-timeouts-when-erasing-multiple-blocks.patch
+++ b/patches/linux-3.6.10/0018-Fix-for-mmc-timeouts-when-erasing-multiple-blocks.patch
diff --git a/patches/linux-3.6.7/0019-Fix-problem-with-dma-that-could-corrupt-sdcard-espec.patch b/patches/linux-3.6.10/0019-Fix-problem-with-dma-that-could-corrupt-sdcard-espec.patch
index 46b5149..46b5149 100644
--- a/patches/linux-3.6.7/0019-Fix-problem-with-dma-that-could-corrupt-sdcard-espec.patch
+++ b/patches/linux-3.6.10/0019-Fix-problem-with-dma-that-could-corrupt-sdcard-espec.patch
diff --git a/patches/linux-3.6.7/0020-Update-to-match-latest-vc-side-vchiq.-Allows-vchiq-c.patch b/patches/linux-3.6.10/0020-Update-to-match-latest-vc-side-vchiq.-Allows-vchiq-c.patch
index 03a7398..ca43e6d 100644
--- a/patches/linux-3.6.7/0020-Update-to-match-latest-vc-side-vchiq.-Allows-vchiq-c.patch
+++ b/patches/linux-3.6.10/0020-Update-to-match-latest-vc-side-vchiq.-Allows-vchiq-c.patch
@@ -1,7 +1,7 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 26 Mar 2012 22:10:01 +0100
-Subject: [PATCH] Update to match latest vc side vchiq. Allows vchiq calls
- from kernel.
+Subject: [PATCH] Update to match latest vc side vchiq. Allows vchiq calls from
+ kernel.
 
 ---
  drivers/misc/vc04_services/Makefile                |   4 +-
diff --git a/patches/linux-3.6.7/0021-First-pass-at-alsa-sound-driver.-Some-functionality-.patch b/patches/linux-3.6.10/0021-First-pass-at-alsa-sound-driver.-Some-functionality-.patch
index 78b6dce..f4efad2 100644
--- a/patches/linux-3.6.7/0021-First-pass-at-alsa-sound-driver.-Some-functionality-.patch
+++ b/patches/linux-3.6.10/0021-First-pass-at-alsa-sound-driver.-Some-functionality-.patch
@@ -1,7 +1,7 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 26 Mar 2012 22:15:50 +0100
-Subject: [PATCH] First pass at alsa sound driver. Some functionality, but
- also some underruns
+Subject: [PATCH] First pass at alsa sound driver. Some functionality, but also
+ some underruns
 
 ---
  arch/arm/mach-bcm2708/bcm2708.c    |  12 +
diff --git a/patches/linux-3.6.7/0022-Cast-to-avoid-warning.patch b/patches/linux-3.6.10/0022-Cast-to-avoid-warning.patch
index 0aca4f5..0aca4f5 100644
--- a/patches/linux-3.6.7/0022-Cast-to-avoid-warning.patch
+++ b/patches/linux-3.6.10/0022-Cast-to-avoid-warning.patch
diff --git a/patches/linux-3.6.7/0023-Add-new-ioctl-to-match-latest-vc-side-code.patch b/patches/linux-3.6.10/0023-Add-new-ioctl-to-match-latest-vc-side-code.patch
index 4f29eb2..4f29eb2 100644
--- a/patches/linux-3.6.7/0023-Add-new-ioctl-to-match-latest-vc-side-code.patch
+++ b/patches/linux-3.6.10/0023-Add-new-ioctl-to-match-latest-vc-side-code.patch
diff --git a/patches/linux-3.6.7/0024-Enable-sound-kernel-modules.-Tidy-formatting.-Fix-ct.patch b/patches/linux-3.6.10/0024-Enable-sound-kernel-modules.-Tidy-formatting.-Fix-ct.patch
index b4ae6fe..b4ae6fe 100644
--- a/patches/linux-3.6.7/0024-Enable-sound-kernel-modules.-Tidy-formatting.-Fix-ct.patch
+++ b/patches/linux-3.6.10/0024-Enable-sound-kernel-modules.-Tidy-formatting.-Fix-ct.patch
diff --git a/patches/linux-3.6.7/0025-Add-missing-header-file-update-for-vc_mem-iocts.patch b/patches/linux-3.6.10/0025-Add-missing-header-file-update-for-vc_mem-iocts.patch
index 0533e73..0533e73 100644
--- a/patches/linux-3.6.7/0025-Add-missing-header-file-update-for-vc_mem-iocts.patch
+++ b/patches/linux-3.6.10/0025-Add-missing-header-file-update-for-vc_mem-iocts.patch
diff --git a/patches/linux-3.6.7/0026-Remove-most-of-the-alsa-debug-messages.patch b/patches/linux-3.6.10/0026-Remove-most-of-the-alsa-debug-messages.patch
index 8553229..8553229 100644
--- a/patches/linux-3.6.7/0026-Remove-most-of-the-alsa-debug-messages.patch
+++ b/patches/linux-3.6.10/0026-Remove-most-of-the-alsa-debug-messages.patch
diff --git a/patches/linux-3.6.7/0027-add-temporary-workaround-for-fbset-crashes.patch b/patches/linux-3.6.10/0027-add-temporary-workaround-for-fbset-crashes.patch
index 66a028b..66a028b 100644
--- a/patches/linux-3.6.7/0027-add-temporary-workaround-for-fbset-crashes.patch
+++ b/patches/linux-3.6.10/0027-add-temporary-workaround-for-fbset-crashes.patch
diff --git a/patches/linux-3.6.7/0028-Fix-harmless-base-size-typo.patch b/patches/linux-3.6.10/0028-Fix-harmless-base-size-typo.patch
index f4c7bc8..f4c7bc8 100644
--- a/patches/linux-3.6.7/0028-Fix-harmless-base-size-typo.patch
+++ b/patches/linux-3.6.10/0028-Fix-harmless-base-size-typo.patch
diff --git a/patches/linux-3.6.7/0029-Replace-if-1-sections-by-local-configuration-defines.patch b/patches/linux-3.6.10/0029-Replace-if-1-sections-by-local-configuration-defines.patch
index f61d393..1e885d0 100644
--- a/patches/linux-3.6.7/0029-Replace-if-1-sections-by-local-configuration-defines.patch
+++ b/patches/linux-3.6.10/0029-Replace-if-1-sections-by-local-configuration-defines.patch
@@ -1,7 +1,6 @@
 From: Gray Girling <GrayG@Broadcom.com>
 Date: Mon, 16 Apr 2012 14:00:20 +0100
-Subject: [PATCH] Replace #if 1 sections by local configuration #defines
- (tidy)
+Subject: [PATCH] Replace #if 1 sections by local configuration #defines (tidy)
 
 ---
  drivers/mmc/host/sdhci-bcm2708.c | 21 ++++++++++++++-------
diff --git a/patches/linux-3.6.7/0030-Don-t-send-data-block-when-emitting-silence.patch b/patches/linux-3.6.10/0030-Don-t-send-data-block-when-emitting-silence.patch
index 614831e..614831e 100644
--- a/patches/linux-3.6.7/0030-Don-t-send-data-block-when-emitting-silence.patch
+++ b/patches/linux-3.6.10/0030-Don-t-send-data-block-when-emitting-silence.patch
diff --git a/patches/linux-3.6.7/0031-Fix-hopefully-for-DWC_MEMCPY-kernel-panics.-Thanks-t.patch b/patches/linux-3.6.10/0031-Fix-hopefully-for-DWC_MEMCPY-kernel-panics.-Thanks-t.patch
index a95cafd..80887ee 100644
--- a/patches/linux-3.6.7/0031-Fix-hopefully-for-DWC_MEMCPY-kernel-panics.-Thanks-t.patch
+++ b/patches/linux-3.6.10/0031-Fix-hopefully-for-DWC_MEMCPY-kernel-panics.-Thanks-t.patch
@@ -1,7 +1,7 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 27 Apr 2012 00:30:15 +0100
-Subject: [PATCH] Fix (hopefully) for DWC_MEMCPY kernel panics. Thanks to
- Naren Sankar for finding this
+Subject: [PATCH] Fix (hopefully) for DWC_MEMCPY kernel panics. Thanks to Naren
+ Sankar for finding this
 
 ---
  drivers/usb/host/dwc_otg/dwc_otg_hcd.c       | 4 ++++
diff --git a/patches/linux-3.6.7/0032-Build-modules-needed-for-USB-booting-into-kernel.patch b/patches/linux-3.6.10/0032-Build-modules-needed-for-USB-booting-into-kernel.patch
index 7b57066..7b57066 100644
--- a/patches/linux-3.6.7/0032-Build-modules-needed-for-USB-booting-into-kernel.patch
+++ b/patches/linux-3.6.10/0032-Build-modules-needed-for-USB-booting-into-kernel.patch
diff --git a/patches/linux-3.6.7/0033-Whitespace-tidy.-Thanks-Roger.patch b/patches/linux-3.6.10/0033-Whitespace-tidy.-Thanks-Roger.patch
index db8329c..db8329c 100644
--- a/patches/linux-3.6.7/0033-Whitespace-tidy.-Thanks-Roger.patch
+++ b/patches/linux-3.6.10/0033-Whitespace-tidy.-Thanks-Roger.patch
diff --git a/patches/linux-3.6.7/0034-Update-vchiq-to-match-GPU-version.-Should-still-be-c.patch b/patches/linux-3.6.10/0034-Update-vchiq-to-match-GPU-version.-Should-still-be-c.patch
index 90a51a8..11de021 100644
--- a/patches/linux-3.6.7/0034-Update-vchiq-to-match-GPU-version.-Should-still-be-c.patch
+++ b/patches/linux-3.6.10/0034-Update-vchiq-to-match-GPU-version.-Should-still-be-c.patch
@@ -1,7 +1,6 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 27 Apr 2012 12:43:54 +0100
-Subject: [PATCH] Update vchiq to match GPU version. Should still be
- compatible
+Subject: [PATCH] Update vchiq to match GPU version. Should still be compatible
 
 ---
  .../vc04_services/interface/vchiq_arm/vchiq_arm.c  | 19 ++++++++++------
diff --git a/patches/linux-3.6.7/0035-added-support-for-TT-in-the-USB-driver.-Thanks-Naren.patch b/patches/linux-3.6.10/0035-added-support-for-TT-in-the-USB-driver.-Thanks-Naren.patch
index da119ea..da119ea 100644
--- a/patches/linux-3.6.7/0035-added-support-for-TT-in-the-USB-driver.-Thanks-Naren.patch
+++ b/patches/linux-3.6.10/0035-added-support-for-TT-in-the-USB-driver.-Thanks-Naren.patch
diff --git a/patches/linux-3.6.7/0036-Swap-Red-and-Blue-over-in-32bpp-framebuffer-mode.patch b/patches/linux-3.6.10/0036-Swap-Red-and-Blue-over-in-32bpp-framebuffer-mode.patch
index a3a891a..a3a891a 100644
--- a/patches/linux-3.6.7/0036-Swap-Red-and-Blue-over-in-32bpp-framebuffer-mode.patch
+++ b/patches/linux-3.6.10/0036-Swap-Red-and-Blue-over-in-32bpp-framebuffer-mode.patch
diff --git a/patches/linux-3.6.7/0037-Update-emergency-config-to-match-latest-debug-one.patch b/patches/linux-3.6.10/0037-Update-emergency-config-to-match-latest-debug-one.patch
index 93bf5aa..93bf5aa 100644
--- a/patches/linux-3.6.7/0037-Update-emergency-config-to-match-latest-debug-one.patch
+++ b/patches/linux-3.6.10/0037-Update-emergency-config-to-match-latest-debug-one.patch
diff --git a/patches/linux-3.6.7/0038-Use-dwc_alloc_atomic.-Thanks-bootc.patch b/patches/linux-3.6.10/0038-Use-dwc_alloc_atomic.-Thanks-bootc.patch
index 6fce20b..6fce20b 100644
--- a/patches/linux-3.6.7/0038-Use-dwc_alloc_atomic.-Thanks-bootc.patch
+++ b/patches/linux-3.6.10/0038-Use-dwc_alloc_atomic.-Thanks-bootc.patch
diff --git a/patches/linux-3.6.7/0039-possible-fix-for-sdcard-missing-status.-Thank-naren.patch b/patches/linux-3.6.10/0039-possible-fix-for-sdcard-missing-status.-Thank-naren.patch
index 80ed865..80ed865 100644
--- a/patches/linux-3.6.7/0039-possible-fix-for-sdcard-missing-status.-Thank-naren.patch
+++ b/patches/linux-3.6.10/0039-possible-fix-for-sdcard-missing-status.-Thank-naren.patch
diff --git a/patches/linux-3.6.7/0040-Fix-BUG-in-bcm2708_fb_set_par-doesn-t-work-if-the-co.patch b/patches/linux-3.6.10/0040-Fix-BUG-in-bcm2708_fb_set_par-doesn-t-work-if-the-co.patch
index 09460a4..09460a4 100644
--- a/patches/linux-3.6.7/0040-Fix-BUG-in-bcm2708_fb_set_par-doesn-t-work-if-the-co.patch
+++ b/patches/linux-3.6.10/0040-Fix-BUG-in-bcm2708_fb_set_par-doesn-t-work-if-the-co.patch
diff --git a/patches/linux-3.6.7/0041-Fix-for-DWC-OTG-HCD-URB-Dequeue-has-NULL-URB-panic.-.patch b/patches/linux-3.6.10/0041-Fix-for-DWC-OTG-HCD-URB-Dequeue-has-NULL-URB-panic.-.patch
index f48afc8..f48afc8 100644
--- a/patches/linux-3.6.7/0041-Fix-for-DWC-OTG-HCD-URB-Dequeue-has-NULL-URB-panic.-.patch
+++ b/patches/linux-3.6.10/0041-Fix-for-DWC-OTG-HCD-URB-Dequeue-has-NULL-URB-panic.-.patch
diff --git a/patches/linux-3.6.7/0042-Fix-for-bug-in-mbox_read.-Thanks-lp0.patch b/patches/linux-3.6.10/0042-Fix-for-bug-in-mbox_read.-Thanks-lp0.patch
index 4a7e3c3..4a7e3c3 100644
--- a/patches/linux-3.6.7/0042-Fix-for-bug-in-mbox_read.-Thanks-lp0.patch
+++ b/patches/linux-3.6.10/0042-Fix-for-bug-in-mbox_read.-Thanks-lp0.patch
diff --git a/patches/linux-3.6.7/0043-Add-__VCCOREVER__-to-makefile.patch b/patches/linux-3.6.10/0043-Add-__VCCOREVER__-to-makefile.patch
index b5aafda..b5aafda 100644
--- a/patches/linux-3.6.7/0043-Add-__VCCOREVER__-to-makefile.patch
+++ b/patches/linux-3.6.10/0043-Add-__VCCOREVER__-to-makefile.patch
diff --git a/patches/linux-3.6.7/0044-Change-PHYS_OFFSET-to-PLAT_PHYS_OFFSET.patch b/patches/linux-3.6.10/0044-Change-PHYS_OFFSET-to-PLAT_PHYS_OFFSET.patch
index e16eac4..e16eac4 100644
--- a/patches/linux-3.6.7/0044-Change-PHYS_OFFSET-to-PLAT_PHYS_OFFSET.patch
+++ b/patches/linux-3.6.10/0044-Change-PHYS_OFFSET-to-PLAT_PHYS_OFFSET.patch
diff --git a/patches/linux-3.6.7/0045-sdcard-patch-improvements-from-naren.patch b/patches/linux-3.6.10/0045-sdcard-patch-improvements-from-naren.patch
index 52ece3b..52ece3b 100644
--- a/patches/linux-3.6.7/0045-sdcard-patch-improvements-from-naren.patch
+++ b/patches/linux-3.6.10/0045-sdcard-patch-improvements-from-naren.patch
diff --git a/patches/linux-3.6.7/0046-Invert-sense-of-sdcard-access-trigger-OK-LED-so-it-i.patch b/patches/linux-3.6.10/0046-Invert-sense-of-sdcard-access-trigger-OK-LED-so-it-i.patch
index 6cc0664..6cc0664 100644
--- a/patches/linux-3.6.7/0046-Invert-sense-of-sdcard-access-trigger-OK-LED-so-it-i.patch
+++ b/patches/linux-3.6.10/0046-Invert-sense-of-sdcard-access-trigger-OK-LED-so-it-i.patch
diff --git a/patches/linux-3.6.7/0047-Added-power-off-message-to-allow-kexec-to-work.-Than.patch b/patches/linux-3.6.10/0047-Added-power-off-message-to-allow-kexec-to-work.-Than.patch
index 4277a9b..4277a9b 100644
--- a/patches/linux-3.6.7/0047-Added-power-off-message-to-allow-kexec-to-work.-Than.patch
+++ b/patches/linux-3.6.10/0047-Added-power-off-message-to-allow-kexec-to-work.-Than.patch
diff --git a/patches/linux-3.6.7/0048-remove-unwanted-file.patch b/patches/linux-3.6.10/0048-remove-unwanted-file.patch
index b2fc796..b2fc796 100644
--- a/patches/linux-3.6.7/0048-remove-unwanted-file.patch
+++ b/patches/linux-3.6.10/0048-remove-unwanted-file.patch
diff --git a/patches/linux-3.6.7/0049-Enable-PREEMPT-and-SCHED_AUTOGROUP.patch b/patches/linux-3.6.10/0049-Enable-PREEMPT-and-SCHED_AUTOGROUP.patch
index 02c5dd7..02c5dd7 100644
--- a/patches/linux-3.6.7/0049-Enable-PREEMPT-and-SCHED_AUTOGROUP.patch
+++ b/patches/linux-3.6.10/0049-Enable-PREEMPT-and-SCHED_AUTOGROUP.patch
diff --git a/patches/linux-3.6.7/0050-Added-support-for-USB-webcams.patch b/patches/linux-3.6.10/0050-Added-support-for-USB-webcams.patch
index 0e39e19..0e39e19 100644
--- a/patches/linux-3.6.7/0050-Added-support-for-USB-webcams.patch
+++ b/patches/linux-3.6.10/0050-Added-support-for-USB-webcams.patch
diff --git a/patches/linux-3.6.7/0051-Enable-ipv6-due-to-popular-demand.patch b/patches/linux-3.6.10/0051-Enable-ipv6-due-to-popular-demand.patch
index 223f3d7..223f3d7 100644
--- a/patches/linux-3.6.7/0051-Enable-ipv6-due-to-popular-demand.patch
+++ b/patches/linux-3.6.10/0051-Enable-ipv6-due-to-popular-demand.patch
diff --git a/patches/linux-3.6.7/0052-Fix-regression-in-debug-kernel-config-options.patch b/patches/linux-3.6.10/0052-Fix-regression-in-debug-kernel-config-options.patch
index 027e98c..027e98c 100644
--- a/patches/linux-3.6.7/0052-Fix-regression-in-debug-kernel-config-options.patch
+++ b/patches/linux-3.6.10/0052-Fix-regression-in-debug-kernel-config-options.patch
diff --git a/patches/linux-3.6.7/0053-bcm2835-ctl-fix-alsamixer-control.patch b/patches/linux-3.6.10/0053-bcm2835-ctl-fix-alsamixer-control.patch
index 726a5da..726a5da 100644
--- a/patches/linux-3.6.7/0053-bcm2835-ctl-fix-alsamixer-control.patch
+++ b/patches/linux-3.6.10/0053-bcm2835-ctl-fix-alsamixer-control.patch
diff --git a/patches/linux-3.6.7/0054-bcm2835-ctl-limit-maximal-volume-to-4db.patch b/patches/linux-3.6.10/0054-bcm2835-ctl-limit-maximal-volume-to-4db.patch
index 87d7d17..87d7d17 100644
--- a/patches/linux-3.6.7/0054-bcm2835-ctl-limit-maximal-volume-to-4db.patch
+++ b/patches/linux-3.6.10/0054-bcm2835-ctl-limit-maximal-volume-to-4db.patch
diff --git a/patches/linux-3.6.7/0055-Add-iptables-and-devtmpfs_mount-to-non-cutdown-confi.patch b/patches/linux-3.6.10/0055-Add-iptables-and-devtmpfs_mount-to-non-cutdown-confi.patch
index 2f3dd68..2f3dd68 100644
--- a/patches/linux-3.6.7/0055-Add-iptables-and-devtmpfs_mount-to-non-cutdown-confi.patch
+++ b/patches/linux-3.6.10/0055-Add-iptables-and-devtmpfs_mount-to-non-cutdown-confi.patch
diff --git a/patches/linux-3.6.7/0056-sdhci-bcm2708-speed-up-DMA-sync.patch b/patches/linux-3.6.10/0056-sdhci-bcm2708-speed-up-DMA-sync.patch
index a529cd4..a529cd4 100644
--- a/patches/linux-3.6.7/0056-sdhci-bcm2708-speed-up-DMA-sync.patch
+++ b/patches/linux-3.6.10/0056-sdhci-bcm2708-speed-up-DMA-sync.patch
diff --git a/patches/linux-3.6.7/0057-sdhci-bcm2708-remove-custom-clock-handling.patch b/patches/linux-3.6.10/0057-sdhci-bcm2708-remove-custom-clock-handling.patch
index efe862f..efe862f 100644
--- a/patches/linux-3.6.7/0057-sdhci-bcm2708-remove-custom-clock-handling.patch
+++ b/patches/linux-3.6.10/0057-sdhci-bcm2708-remove-custom-clock-handling.patch
diff --git a/patches/linux-3.6.7/0058-sdhci-bcm2708-add-additional-quirks.patch b/patches/linux-3.6.10/0058-sdhci-bcm2708-add-additional-quirks.patch
index 54e1ef8..54e1ef8 100644
--- a/patches/linux-3.6.7/0058-sdhci-bcm2708-add-additional-quirks.patch
+++ b/patches/linux-3.6.10/0058-sdhci-bcm2708-add-additional-quirks.patch
diff --git a/patches/linux-3.6.7/0059-sdhci-bcm2708-add-allow_highspeed-parameter.patch b/patches/linux-3.6.10/0059-sdhci-bcm2708-add-allow_highspeed-parameter.patch
index f101260..f101260 100644
--- a/patches/linux-3.6.7/0059-sdhci-bcm2708-add-allow_highspeed-parameter.patch
+++ b/patches/linux-3.6.10/0059-sdhci-bcm2708-add-allow_highspeed-parameter.patch
diff --git a/patches/linux-3.6.7/0060-sdhci-bcm2708-assume-50-MHz-eMMC-clock.patch b/patches/linux-3.6.10/0060-sdhci-bcm2708-assume-50-MHz-eMMC-clock.patch
index f19e29f..f19e29f 100644
--- a/patches/linux-3.6.7/0060-sdhci-bcm2708-assume-50-MHz-eMMC-clock.patch
+++ b/patches/linux-3.6.10/0060-sdhci-bcm2708-assume-50-MHz-eMMC-clock.patch
diff --git a/patches/linux-3.6.7/0061-Allow-emmc-clock-to-be-specified-as-command-line-par.patch b/patches/linux-3.6.10/0061-Allow-emmc-clock-to-be-specified-as-command-line-par.patch
index 16ff96b..16ff96b 100644
--- a/patches/linux-3.6.7/0061-Allow-emmc-clock-to-be-specified-as-command-line-par.patch
+++ b/patches/linux-3.6.10/0061-Allow-emmc-clock-to-be-specified-as-command-line-par.patch
diff --git a/patches/linux-3.6.7/0062-sdhci-bcm2708-raise-DMA-sync-timeout.patch b/patches/linux-3.6.10/0062-sdhci-bcm2708-raise-DMA-sync-timeout.patch
index f5cfca6..f5cfca6 100644
--- a/patches/linux-3.6.7/0062-sdhci-bcm2708-raise-DMA-sync-timeout.patch
+++ b/patches/linux-3.6.10/0062-sdhci-bcm2708-raise-DMA-sync-timeout.patch
diff --git a/patches/linux-3.6.7/0063-Fix-bool-int-error.patch b/patches/linux-3.6.10/0063-Fix-bool-int-error.patch
index 1bbeaba..1bbeaba 100644
--- a/patches/linux-3.6.7/0063-Fix-bool-int-error.patch
+++ b/patches/linux-3.6.10/0063-Fix-bool-int-error.patch
diff --git a/patches/linux-3.6.7/0064-Fix-bool-int-error-part-2.patch b/patches/linux-3.6.10/0064-Fix-bool-int-error-part-2.patch
index d56c1b2..d56c1b2 100644
--- a/patches/linux-3.6.7/0064-Fix-bool-int-error-part-2.patch
+++ b/patches/linux-3.6.10/0064-Fix-bool-int-error-part-2.patch
diff --git a/patches/linux-3.6.7/0065-More-config-options-for-iptables-device-mapper-PPP_M.patch b/patches/linux-3.6.10/0065-More-config-options-for-iptables-device-mapper-PPP_M.patch
index 4b8f871..4b8f871 100644
--- a/patches/linux-3.6.7/0065-More-config-options-for-iptables-device-mapper-PPP_M.patch
+++ b/patches/linux-3.6.10/0065-More-config-options-for-iptables-device-mapper-PPP_M.patch
diff --git a/patches/linux-3.6.7/0066-Explicitly-set-usb-host-channels-to-8-as-in-the-spec.patch b/patches/linux-3.6.10/0066-Explicitly-set-usb-host-channels-to-8-as-in-the-spec.patch
index d9317dc..d9317dc 100644
--- a/patches/linux-3.6.7/0066-Explicitly-set-usb-host-channels-to-8-as-in-the-spec.patch
+++ b/patches/linux-3.6.10/0066-Explicitly-set-usb-host-channels-to-8-as-in-the-spec.patch
diff --git a/patches/linux-3.6.7/0067-Add-hfs-hfsplus-modules.patch b/patches/linux-3.6.10/0067-Add-hfs-hfsplus-modules.patch
index a12d2c6..a12d2c6 100644
--- a/patches/linux-3.6.7/0067-Add-hfs-hfsplus-modules.patch
+++ b/patches/linux-3.6.10/0067-Add-hfs-hfsplus-modules.patch
diff --git a/patches/linux-3.6.7/0068-Remove-silence-method-and-use-atomic-flags-for-kmall.patch b/patches/linux-3.6.10/0068-Remove-silence-method-and-use-atomic-flags-for-kmall.patch
index 4eccfaf..4eccfaf 100644
--- a/patches/linux-3.6.7/0068-Remove-silence-method-and-use-atomic-flags-for-kmall.patch
+++ b/patches/linux-3.6.10/0068-Remove-silence-method-and-use-atomic-flags-for-kmall.patch
diff --git a/patches/linux-3.6.7/0069-Fix-unintended-line-swap-that-cause-cause-memory-lea.patch b/patches/linux-3.6.10/0069-Fix-unintended-line-swap-that-cause-cause-memory-lea.patch
index 36411a7..36411a7 100644
--- a/patches/linux-3.6.7/0069-Fix-unintended-line-swap-that-cause-cause-memory-lea.patch
+++ b/patches/linux-3.6.10/0069-Fix-unintended-line-swap-that-cause-cause-memory-lea.patch
diff --git a/patches/linux-3.6.7/0070-Use-ndelay-rather-than-udelay.-Thanks-lb.patch b/patches/linux-3.6.10/0070-Use-ndelay-rather-than-udelay.-Thanks-lb.patch
index 6d70880..6d70880 100644
--- a/patches/linux-3.6.7/0070-Use-ndelay-rather-than-udelay.-Thanks-lb.patch
+++ b/patches/linux-3.6.10/0070-Use-ndelay-rather-than-udelay.-Thanks-lb.patch
diff --git a/patches/linux-3.6.7/0071-Add-NFSD.-Add-some-dvb-options.-Add-CONFIG_LOCALVERS.patch b/patches/linux-3.6.10/0071-Add-NFSD.-Add-some-dvb-options.-Add-CONFIG_LOCALVERS.patch
index 18123c3..18123c3 100644
--- a/patches/linux-3.6.7/0071-Add-NFSD.-Add-some-dvb-options.-Add-CONFIG_LOCALVERS.patch
+++ b/patches/linux-3.6.10/0071-Add-NFSD.-Add-some-dvb-options.-Add-CONFIG_LOCALVERS.patch
diff --git a/patches/linux-3.6.7/0072-Fixed-issue-with-some-keyboards-giving-too-much-data.patch b/patches/linux-3.6.10/0072-Fixed-issue-with-some-keyboards-giving-too-much-data.patch
index 9d827c2..1fd1eb7 100644
--- a/patches/linux-3.6.7/0072-Fixed-issue-with-some-keyboards-giving-too-much-data.patch
+++ b/patches/linux-3.6.10/0072-Fixed-issue-with-some-keyboards-giving-too-much-data.patch
@@ -1,10 +1,9 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 26 Jun 2012 15:54:11 +0100
 Subject: [PATCH] Fixed issue with some keyboards giving too much data 
- resulting in overrun of the input buffer and memory 
- corruption causing an OOPS. We should be checking for the 
- fact that we might get more data than we want. Thanks
- Naren.
+ resulting in overrun of the input buffer and memory  corruption causing an
+ OOPS. We should be checking for the  fact that we might get more data than we
+ want. Thanks Naren.
 
 ---
  drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c  |  4 ++--
diff --git a/patches/linux-3.6.7/0073-Add-802.1q-vlan-module.patch b/patches/linux-3.6.10/0073-Add-802.1q-vlan-module.patch
index 375a778..375a778 100644
--- a/patches/linux-3.6.7/0073-Add-802.1q-vlan-module.patch
+++ b/patches/linux-3.6.10/0073-Add-802.1q-vlan-module.patch
diff --git a/patches/linux-3.6.7/0074-Add-interrupt-support-to-gpio-driver.-Thanks-Mrkva.patch b/patches/linux-3.6.10/0074-Add-interrupt-support-to-gpio-driver.-Thanks-Mrkva.patch
index 8ea98b3..8ea98b3 100644
--- a/patches/linux-3.6.7/0074-Add-interrupt-support-to-gpio-driver.-Thanks-Mrkva.patch
+++ b/patches/linux-3.6.10/0074-Add-interrupt-support-to-gpio-driver.-Thanks-Mrkva.patch
diff --git a/patches/linux-3.6.7/0075-Add-a-pm_power_off-function-that-resets-us-and-indic.patch b/patches/linux-3.6.10/0075-Add-a-pm_power_off-function-that-resets-us-and-indic.patch
index d5b7964..f305bf7 100644
--- a/patches/linux-3.6.7/0075-Add-a-pm_power_off-function-that-resets-us-and-indic.patch
+++ b/patches/linux-3.6.10/0075-Add-a-pm_power_off-function-that-resets-us-and-indic.patch
@@ -1,8 +1,7 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 30 Jun 2012 16:07:18 +0100
 Subject: [PATCH] Add a pm_power_off function that resets us, and indicates to
- bootcode.bin not to reboot us. Should allow a lower power
- 'off' state
+ bootcode.bin not to reboot us. Should allow a lower power 'off' state
 
 ---
  arch/arm/mach-bcm2708/bcm2708.c               | 14 ++++++++++++++
diff --git a/patches/linux-3.6.7/0076-Store-palette-info-where-GPU-can-see-it-so-8bpp-mode.patch b/patches/linux-3.6.10/0076-Store-palette-info-where-GPU-can-see-it-so-8bpp-mode.patch
index 53679b9..53679b9 100644
--- a/patches/linux-3.6.7/0076-Store-palette-info-where-GPU-can-see-it-so-8bpp-mode.patch
+++ b/patches/linux-3.6.10/0076-Store-palette-info-where-GPU-can-see-it-so-8bpp-mode.patch
diff --git a/patches/linux-3.6.7/0077-Avoid-blanking-console-when-not-in-palettised-mode.patch b/patches/linux-3.6.10/0077-Avoid-blanking-console-when-not-in-palettised-mode.patch
index dbf2312..dbf2312 100644
--- a/patches/linux-3.6.7/0077-Avoid-blanking-console-when-not-in-palettised-mode.patch
+++ b/patches/linux-3.6.10/0077-Avoid-blanking-console-when-not-in-palettised-mode.patch
diff --git a/patches/linux-3.6.7/0078-Add-mechanism-to-reduce-the-number-of-SOF-interrupts.patch b/patches/linux-3.6.10/0078-Add-mechanism-to-reduce-the-number-of-SOF-interrupts.patch
index ee99a33..4269c15 100644
--- a/patches/linux-3.6.7/0078-Add-mechanism-to-reduce-the-number-of-SOF-interrupts.patch
+++ b/patches/linux-3.6.10/0078-Add-mechanism-to-reduce-the-number-of-SOF-interrupts.patch
@@ -1,8 +1,7 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 6 Jul 2012 18:30:43 +0100
 Subject: [PATCH] Add mechanism to reduce the number of SOF interrupts in
- dwc_otg USB driver. Enable through
- /proc/dwc_sof/SOF_reduction
+ dwc_otg USB driver. Enable through /proc/dwc_sof/SOF_reduction
 
 ---
  .../usb/host/dwc_common_port/dwc_common_linux.c    |   2 +-
diff --git a/patches/linux-3.6.7/0079-Updating-dwc_otg-driver-to-fix-issue-releasing-pcm-s.patch b/patches/linux-3.6.10/0079-Updating-dwc_otg-driver-to-fix-issue-releasing-pcm-s.patch
index f1cc6d7..f1cc6d7 100644
--- a/patches/linux-3.6.7/0079-Updating-dwc_otg-driver-to-fix-issue-releasing-pcm-s.patch
+++ b/patches/linux-3.6.10/0079-Updating-dwc_otg-driver-to-fix-issue-releasing-pcm-s.patch
diff --git a/patches/linux-3.6.7/0080-Backport-of-Chris-Boot-s-i2c-and-spi-drivers.patch b/patches/linux-3.6.10/0080-Backport-of-Chris-Boot-s-i2c-and-spi-drivers.patch
index 88419ce..88419ce 100644
--- a/patches/linux-3.6.7/0080-Backport-of-Chris-Boot-s-i2c-and-spi-drivers.patch
+++ b/patches/linux-3.6.10/0080-Backport-of-Chris-Boot-s-i2c-and-spi-drivers.patch
diff --git a/patches/linux-3.6.7/0081-forgotten-files.patch b/patches/linux-3.6.10/0081-forgotten-files.patch
index 80a8699..80a8699 100644
--- a/patches/linux-3.6.7/0081-forgotten-files.patch
+++ b/patches/linux-3.6.10/0081-forgotten-files.patch
diff --git a/patches/linux-3.6.7/0082-Enable-I2C-and-SPI-modules-in-full-config.patch b/patches/linux-3.6.10/0082-Enable-I2C-and-SPI-modules-in-full-config.patch
index ce4c3ff..ce4c3ff 100644
--- a/patches/linux-3.6.7/0082-Enable-I2C-and-SPI-modules-in-full-config.patch
+++ b/patches/linux-3.6.10/0082-Enable-I2C-and-SPI-modules-in-full-config.patch
diff --git a/patches/linux-3.6.7/0083-Possible-fix-for-failure-to-boot-with-compressed-ker.patch b/patches/linux-3.6.10/0083-Possible-fix-for-failure-to-boot-with-compressed-ker.patch
index 9a10c35..9a10c35 100644
--- a/patches/linux-3.6.7/0083-Possible-fix-for-failure-to-boot-with-compressed-ker.patch
+++ b/patches/linux-3.6.10/0083-Possible-fix-for-failure-to-boot-with-compressed-ker.patch
diff --git a/patches/linux-3.6.7/0084-Another-try-at-fixing-compressed-kernel-booting.patch b/patches/linux-3.6.10/0084-Another-try-at-fixing-compressed-kernel-booting.patch
index 1ab0414..1ab0414 100644
--- a/patches/linux-3.6.7/0084-Another-try-at-fixing-compressed-kernel-booting.patch
+++ b/patches/linux-3.6.10/0084-Another-try-at-fixing-compressed-kernel-booting.patch
diff --git a/patches/linux-3.6.7/0085-Add-missing-UART0_CLOCK-from-last-commit.patch b/patches/linux-3.6.10/0085-Add-missing-UART0_CLOCK-from-last-commit.patch
index 6f824fa..6f824fa 100644
--- a/patches/linux-3.6.7/0085-Add-missing-UART0_CLOCK-from-last-commit.patch
+++ b/patches/linux-3.6.10/0085-Add-missing-UART0_CLOCK-from-last-commit.patch
diff --git a/patches/linux-3.6.7/0086-Change-to-add-SCSI-tape-support-as-loadable-modules-.patch b/patches/linux-3.6.10/0086-Change-to-add-SCSI-tape-support-as-loadable-modules-.patch
index 23c04cd..d483def 100644
--- a/patches/linux-3.6.7/0086-Change-to-add-SCSI-tape-support-as-loadable-modules-.patch
+++ b/patches/linux-3.6.10/0086-Change-to-add-SCSI-tape-support-as-loadable-modules-.patch
@@ -1,8 +1,8 @@
 From: chrisw2 <chrisw2@rpi01>
 Date: Wed, 11 Jul 2012 00:19:00 +0100
-Subject: [PATCH] Change to add SCSI tape support as loadable modules to
- kernel config after line 264 add these two lines:
- CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m
+Subject: [PATCH] Change to add SCSI tape support as loadable modules to kernel
+ config after line 264 add these two lines: CONFIG_CHR_DEV_ST=m
+ CONFIG_CHR_DEV_OSST=m
 
 ---
  arch/arm/configs/bcmrpi_defconfig | 2 ++
diff --git a/patches/linux-3.6.7/0087-Add-temporary-fix-for-hang-when-quitting-X.patch b/patches/linux-3.6.10/0087-Add-temporary-fix-for-hang-when-quitting-X.patch
index 773e91d..773e91d 100644
--- a/patches/linux-3.6.7/0087-Add-temporary-fix-for-hang-when-quitting-X.patch
+++ b/patches/linux-3.6.10/0087-Add-temporary-fix-for-hang-when-quitting-X.patch
diff --git a/patches/linux-3.6.7/0088-Better-fix-for-quitting-X-hang.-Interrupted-mailbox-.patch b/patches/linux-3.6.10/0088-Better-fix-for-quitting-X-hang.-Interrupted-mailbox-.patch
index 2fd6bd6..8eb76a3 100644
--- a/patches/linux-3.6.7/0088-Better-fix-for-quitting-X-hang.-Interrupted-mailbox-.patch
+++ b/patches/linux-3.6.10/0088-Better-fix-for-quitting-X-hang.-Interrupted-mailbox-.patch
@@ -1,8 +1,8 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 14 Jul 2012 18:38:58 +0100
-Subject: [PATCH] Better fix for quitting X hang. Interrupted mailbox reads
- are not something we can reliably recover from, so
- down_interruptable is not a safe call.
+Subject: [PATCH] Better fix for quitting X hang. Interrupted mailbox reads are
+ not something we can reliably recover from, so down_interruptable is not a
+ safe call.
 
 ---
  arch/arm/mach-bcm2708/vcio.c | 12 ++++--------
diff --git a/patches/linux-3.6.7/0089-Add-sync_after_dma-module-parameter.patch b/patches/linux-3.6.10/0089-Add-sync_after_dma-module-parameter.patch
index 28e3730..28e3730 100644
--- a/patches/linux-3.6.7/0089-Add-sync_after_dma-module-parameter.patch
+++ b/patches/linux-3.6.10/0089-Add-sync_after_dma-module-parameter.patch
diff --git a/patches/linux-3.6.7/0090-Add-SPI_SPI_DEV-module.patch b/patches/linux-3.6.10/0090-Add-SPI_SPI_DEV-module.patch
index c60f63a..c60f63a 100644
--- a/patches/linux-3.6.7/0090-Add-SPI_SPI_DEV-module.patch
+++ b/patches/linux-3.6.10/0090-Add-SPI_SPI_DEV-module.patch
diff --git a/patches/linux-3.6.7/0091-Fix-var.width-var.height.-They-actually-mean-display.patch b/patches/linux-3.6.10/0091-Fix-var.width-var.height.-They-actually-mean-display.patch
index 66d10ae..66d10ae 100644
--- a/patches/linux-3.6.7/0091-Fix-var.width-var.height.-They-actually-mean-display.patch
+++ b/patches/linux-3.6.10/0091-Fix-var.width-var.height.-They-actually-mean-display.patch
diff --git a/patches/linux-3.6.7/0092-The-TIMER_PERIOD-should-be-calculated-using-the-time.patch b/patches/linux-3.6.10/0092-The-TIMER_PERIOD-should-be-calculated-using-the-time.patch
index 835ecec..835ecec 100644
--- a/patches/linux-3.6.7/0092-The-TIMER_PERIOD-should-be-calculated-using-the-time.patch
+++ b/patches/linux-3.6.10/0092-The-TIMER_PERIOD-should-be-calculated-using-the-time.patch
diff --git a/patches/linux-3.6.7/0093-update-bcmrpi_defconfig-with-various-user-requests.patch b/patches/linux-3.6.10/0093-update-bcmrpi_defconfig-with-various-user-requests.patch
index 0fec7de..0fec7de 100644
--- a/patches/linux-3.6.7/0093-update-bcmrpi_defconfig-with-various-user-requests.patch
+++ b/patches/linux-3.6.10/0093-update-bcmrpi_defconfig-with-various-user-requests.patch
diff --git a/patches/linux-3.6.7/0094-Possible-fix-for-USB-packets-going-missing.-Thank-gs.patch b/patches/linux-3.6.10/0094-Possible-fix-for-USB-packets-going-missing.-Thank-gs.patch
index b474871..b474871 100644
--- a/patches/linux-3.6.7/0094-Possible-fix-for-USB-packets-going-missing.-Thank-gs.patch
+++ b/patches/linux-3.6.10/0094-Possible-fix-for-USB-packets-going-missing.-Thank-gs.patch
diff --git a/patches/linux-3.6.7/0095-Revert-Possible-fix-for-USB-packets-going-missing.-T.patch b/patches/linux-3.6.10/0095-Revert-Possible-fix-for-USB-packets-going-missing.-T.patch
index 39fea4d..39fea4d 100644
--- a/patches/linux-3.6.7/0095-Revert-Possible-fix-for-USB-packets-going-missing.-T.patch
+++ b/patches/linux-3.6.10/0095-Revert-Possible-fix-for-USB-packets-going-missing.-T.patch
diff --git a/patches/linux-3.6.7/0096-dwc_common_port-remove-unused-cruft-with-onerous-dep.patch b/patches/linux-3.6.10/0096-dwc_common_port-remove-unused-cruft-with-onerous-dep.patch
index 9d167fe..9d167fe 100644
--- a/patches/linux-3.6.7/0096-dwc_common_port-remove-unused-cruft-with-onerous-dep.patch
+++ b/patches/linux-3.6.10/0096-dwc_common_port-remove-unused-cruft-with-onerous-dep.patch
diff --git a/patches/linux-3.6.7/0097-arm-remove-divdi3-it-s-not-necessary-at-all.patch b/patches/linux-3.6.10/0097-arm-remove-divdi3-it-s-not-necessary-at-all.patch
index c8c6830..c8c6830 100644
--- a/patches/linux-3.6.7/0097-arm-remove-divdi3-it-s-not-necessary-at-all.patch
+++ b/patches/linux-3.6.10/0097-arm-remove-divdi3-it-s-not-necessary-at-all.patch
diff --git a/patches/linux-3.6.7/0098-Remove-some-patch-backup-files.patch b/patches/linux-3.6.10/0098-Remove-some-patch-backup-files.patch
index 85f5c2d..85f5c2d 100644
--- a/patches/linux-3.6.7/0098-Remove-some-patch-backup-files.patch
+++ b/patches/linux-3.6.10/0098-Remove-some-patch-backup-files.patch
diff --git a/patches/linux-3.6.7/0099-mach-bcm2708-fix-mach-debug-macro.S-so-that-early-pr.patch b/patches/linux-3.6.10/0099-mach-bcm2708-fix-mach-debug-macro.S-so-that-early-pr.patch
index 54a14bd..54a14bd 100644
--- a/patches/linux-3.6.7/0099-mach-bcm2708-fix-mach-debug-macro.S-so-that-early-pr.patch
+++ b/patches/linux-3.6.10/0099-mach-bcm2708-fix-mach-debug-macro.S-so-that-early-pr.patch
diff --git a/patches/linux-3.6.7/0100-sound-arm-bcm2835.c-add-linux-module.h-include.patch b/patches/linux-3.6.10/0100-sound-arm-bcm2835.c-add-linux-module.h-include.patch
index 648cd96..648cd96 100644
--- a/patches/linux-3.6.7/0100-sound-arm-bcm2835.c-add-linux-module.h-include.patch
+++ b/patches/linux-3.6.10/0100-sound-arm-bcm2835.c-add-linux-module.h-include.patch
diff --git a/patches/linux-3.6.7/0101-vcos-add-linux-kernel.h-include.patch b/patches/linux-3.6.10/0101-vcos-add-linux-kernel.h-include.patch
index 722adb3..722adb3 100644
--- a/patches/linux-3.6.7/0101-vcos-add-linux-kernel.h-include.patch
+++ b/patches/linux-3.6.10/0101-vcos-add-linux-kernel.h-include.patch
diff --git a/patches/linux-3.6.7/0102-bcm2708-update-for-3.2-kernel.patch b/patches/linux-3.6.10/0102-bcm2708-update-for-3.2-kernel.patch
index 7df89fb..e5ca868 100644
--- a/patches/linux-3.6.7/0102-bcm2708-update-for-3.2-kernel.patch
+++ b/patches/linux-3.6.10/0102-bcm2708-update-for-3.2-kernel.patch
@@ -17,10 +17,10 @@ Conflicts:
  5 files changed, 30 insertions(+), 11 deletions(-)
 
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index fd48798..fd49001 100644
+index a8a38ab..64483bf 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1003,6 +1003,8 @@ config ARCH_BCM2708
+@@ -1004,6 +1004,8 @@ config ARCH_BCM2708
  	select CPU_V6
  	select ARM_AMBA
  	select HAVE_CLK
diff --git a/patches/linux-3.6.7/0103-bcm2708-use-a-constant-SC_MULT-SC_SHIFT.patch b/patches/linux-3.6.10/0103-bcm2708-use-a-constant-SC_MULT-SC_SHIFT.patch
index e6fb65f..e6fb65f 100644
--- a/patches/linux-3.6.7/0103-bcm2708-use-a-constant-SC_MULT-SC_SHIFT.patch
+++ b/patches/linux-3.6.10/0103-bcm2708-use-a-constant-SC_MULT-SC_SHIFT.patch
diff --git a/patches/linux-3.6.7/0104-Sync-with-bootc-s-file.patch b/patches/linux-3.6.10/0104-Sync-with-bootc-s-file.patch
index 8d6b243..8d6b243 100644
--- a/patches/linux-3.6.7/0104-Sync-with-bootc-s-file.patch
+++ b/patches/linux-3.6.10/0104-Sync-with-bootc-s-file.patch
diff --git a/patches/linux-3.6.7/0105-sdhci-bcm2708-use-extension-FIFO-to-buffer-DMA-trans.patch b/patches/linux-3.6.10/0105-sdhci-bcm2708-use-extension-FIFO-to-buffer-DMA-trans.patch
index 4ae61d8..4ae61d8 100644
--- a/patches/linux-3.6.7/0105-sdhci-bcm2708-use-extension-FIFO-to-buffer-DMA-trans.patch
+++ b/patches/linux-3.6.10/0105-sdhci-bcm2708-use-extension-FIFO-to-buffer-DMA-trans.patch
diff --git a/patches/linux-3.6.7/0106-sdhci-bcm2708-use-multiblock-type-transfers-for-sing.patch b/patches/linux-3.6.10/0106-sdhci-bcm2708-use-multiblock-type-transfers-for-sing.patch
index ea16c1e..ea16c1e 100644
--- a/patches/linux-3.6.7/0106-sdhci-bcm2708-use-multiblock-type-transfers-for-sing.patch
+++ b/patches/linux-3.6.10/0106-sdhci-bcm2708-use-multiblock-type-transfers-for-sing.patch
diff --git a/patches/linux-3.6.7/0107-Add-module-parameter-for-missing_status-quirk.-sdhci.patch b/patches/linux-3.6.10/0107-Add-module-parameter-for-missing_status-quirk.-sdhci.patch
index c6727c8..74c83e5 100644
--- a/patches/linux-3.6.7/0107-Add-module-parameter-for-missing_status-quirk.-sdhci.patch
+++ b/patches/linux-3.6.10/0107-Add-module-parameter-for-missing_status-quirk.-sdhci.patch
@@ -1,8 +1,7 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 1 Aug 2012 19:02:14 +0100
 Subject: [PATCH] Add module parameter for missing_status quirk.
- sdhci-bcm2708.missing_status=0 may improve interrupt
- latency
+ sdhci-bcm2708.missing_status=0 may improve interrupt latency
 
 ---
  drivers/mmc/host/sdhci-bcm2708.c | 7 ++++++-
diff --git a/patches/linux-3.6.7/0108-Some-fixed-for-ALSA.-Mute-and-volume-changing-should.patch b/patches/linux-3.6.10/0108-Some-fixed-for-ALSA.-Mute-and-volume-changing-should.patch
index a8a6419..a8a6419 100644
--- a/patches/linux-3.6.7/0108-Some-fixed-for-ALSA.-Mute-and-volume-changing-should.patch
+++ b/patches/linux-3.6.10/0108-Some-fixed-for-ALSA.-Mute-and-volume-changing-should.patch
diff --git a/patches/linux-3.6.7/0109-Fix-spinlock-recursion-in-sdhci-bcm2708.c.patch b/patches/linux-3.6.10/0109-Fix-spinlock-recursion-in-sdhci-bcm2708.c.patch
index 5bf0927..5bf0927 100644
--- a/patches/linux-3.6.7/0109-Fix-spinlock-recursion-in-sdhci-bcm2708.c.patch
+++ b/patches/linux-3.6.10/0109-Fix-spinlock-recursion-in-sdhci-bcm2708.c.patch
diff --git a/patches/linux-3.6.7/0110-Revert-Add-mechanism-to-reduce-the-number-of-SOF-int.patch b/patches/linux-3.6.10/0110-Revert-Add-mechanism-to-reduce-the-number-of-SOF-int.patch
index ce8b2c0..9c9b9a9 100644
--- a/patches/linux-3.6.7/0110-Revert-Add-mechanism-to-reduce-the-number-of-SOF-int.patch
+++ b/patches/linux-3.6.10/0110-Revert-Add-mechanism-to-reduce-the-number-of-SOF-int.patch
@@ -1,8 +1,7 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 10 Aug 2012 18:45:05 +0100
 Subject: [PATCH] Revert "Add mechanism to reduce the number of SOF interrupts
- in dwc_otg USB driver. Enable through
- /proc/dwc_sof/SOF_reduction"
+ in dwc_otg USB driver. Enable through /proc/dwc_sof/SOF_reduction"
 
 This reverts commit 85b7821857dd0b9cabab59d47f08eabed74679a3.
 ---
diff --git a/patches/linux-3.6.7/0111-Enable-CONFIG_CRYPTO_XTS.patch b/patches/linux-3.6.10/0111-Enable-CONFIG_CRYPTO_XTS.patch
index 2566d3b..2566d3b 100644
--- a/patches/linux-3.6.7/0111-Enable-CONFIG_CRYPTO_XTS.patch
+++ b/patches/linux-3.6.10/0111-Enable-CONFIG_CRYPTO_XTS.patch
diff --git a/patches/linux-3.6.7/0112-Update-Synopsys-USB-OTG-driver-to-v2.94a-and-disable.patch b/patches/linux-3.6.10/0112-Update-Synopsys-USB-OTG-driver-to-v2.94a-and-disable.patch
index 2829e17..505902b 100644
--- a/patches/linux-3.6.7/0112-Update-Synopsys-USB-OTG-driver-to-v2.94a-and-disable.patch
+++ b/patches/linux-3.6.10/0112-Update-Synopsys-USB-OTG-driver-to-v2.94a-and-disable.patch
@@ -8,6 +8,7 @@ Subject: [PATCH] Update Synopsys USB OTG driver to v2.94a and disable
  drivers/usb/host/dwc_common_port/Makefile.fbsd     |    17 +
  drivers/usb/host/dwc_common_port/Makefile.linux    |    39 +-
  drivers/usb/host/dwc_common_port/changes.txt       |   174 +
+ drivers/usb/host/dwc_common_port/doc/doxygen.cfg   |     0
  .../html/dir_c13d72e45af28cdc461a5f284d3d36fc.html |    81 -
  .../usb/host/dwc_common_port/doc/html/dirs.html    |    22 -
  .../usb/host/dwc_common_port/doc/html/doxygen.css  |   358 -
@@ -228,6 +229,7 @@ Subject: [PATCH] Update Synopsys USB OTG driver to v2.94a and disable
  .../host/dwc_otg/doc/html/globals_func_0x77.html   |    70 -
  .../usb/host/dwc_otg/doc/html/globals_type.html    |   257 +-
  .../usb/host/dwc_otg/doc/html/globals_vars.html    |   122 +-
+ drivers/usb/host/dwc_otg/doc/html/index.html       |     0
  .../dwc_otg/doc/html/linux module attributes.html  |    33 +-
  drivers/usb/host/dwc_otg/doc/html/main.html        |    15 +-
  .../host/dwc_otg/doc/html/module parameters.html   |    72 +-
@@ -334,6 +336,7 @@ Subject: [PATCH] Update Synopsys USB OTG driver to v2.94a and disable
  .../host/dwc_otg/doc/html/unionhwcfg3__data.html   |    56 +-
  .../host/dwc_otg/doc/html/unionhwcfg4__data.html   |    64 +-
  .../host/dwc_otg/doc/html/unionpcgcctl__data.html  |    74 +-
+ drivers/usb/host/dwc_otg/dwc_cfi_common.h          |     0
  drivers/usb/host/dwc_otg/dwc_otg_adp.c             |   854 ++
  drivers/usb/host/dwc_otg/dwc_otg_adp.h             |    80 +
  drivers/usb/host/dwc_otg/dwc_otg_attr.c            |   526 +-
@@ -361,7 +364,11 @@ Subject: [PATCH] Update Synopsys USB OTG driver to v2.94a and disable
  drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c        |  1600 ++-
  drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c       |   341 +-
  drivers/usb/host/dwc_otg/dwc_otg_regs.h            |   916 +-
- 357 files changed, 77086 insertions(+), 71826 deletions(-)
+ drivers/usb/host/dwc_otg/test/Makefile             |     0
+ drivers/usb/host/dwc_otg/test/dwc_otg_test.pm      |     0
+ drivers/usb/host/dwc_otg/test/test_mod_param.pl    |     0
+ drivers/usb/host/dwc_otg/test/test_sysfs.pl        |     0
+ 364 files changed, 77086 insertions(+), 71826 deletions(-)
  mode change 100644 => 100755 drivers/usb/host/dwc_common_port/Makefile
  create mode 100755 drivers/usb/host/dwc_common_port/Makefile.fbsd
  mode change 100644 => 100755 drivers/usb/host/dwc_common_port/Makefile.linux
diff --git a/patches/linux-3.6.7/0113-Merged-in-microframe-scheduler-currently-disabled.-E.patch b/patches/linux-3.6.10/0113-Merged-in-microframe-scheduler-currently-disabled.-E.patch
index 921b30a..921b30a 100644
--- a/patches/linux-3.6.7/0113-Merged-in-microframe-scheduler-currently-disabled.-E.patch
+++ b/patches/linux-3.6.10/0113-Merged-in-microframe-scheduler-currently-disabled.-E.patch
diff --git a/patches/linux-3.6.7/0114-Make-microframe-schedule-patch-a-little-closer-to-de.patch b/patches/linux-3.6.10/0114-Make-microframe-schedule-patch-a-little-closer-to-de.patch
index c206501..c206501 100644
--- a/patches/linux-3.6.7/0114-Make-microframe-schedule-patch-a-little-closer-to-de.patch
+++ b/patches/linux-3.6.10/0114-Make-microframe-schedule-patch-a-little-closer-to-de.patch
diff --git a/patches/linux-3.6.7/0115-Remove-remove-documentation-from-the-source-tree.patch b/patches/linux-3.6.10/0115-Remove-remove-documentation-from-the-source-tree.patch
index bdc59ed..3f214b0 100644
--- a/patches/linux-3.6.7/0115-Remove-remove-documentation-from-the-source-tree.patch
+++ b/patches/linux-3.6.10/0115-Remove-remove-documentation-from-the-source-tree.patch
@@ -1,9 +1,8 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 19 Aug 2012 14:07:26 +0100
 Subject: [PATCH] Remove remove documentation from the source tree There is
- lots of doxygen-generated bundled source documentation in
- the tree. As this is in the source code, remove this
- redundant copy.
+ lots of doxygen-generated bundled source documentation in the tree. As this
+ is in the source code, remove this redundant copy.
 
 ---
  drivers/usb/host/dwc_otg/doc/html/annotated.html   |  101 -
diff --git a/patches/linux-3.6.7/0116-Fix-for-broken-GPIO-with-3.2-kernel.patch b/patches/linux-3.6.10/0116-Fix-for-broken-GPIO-with-3.2-kernel.patch
index c6271db..c6271db 100644
--- a/patches/linux-3.6.7/0116-Fix-for-broken-GPIO-with-3.2-kernel.patch
+++ b/patches/linux-3.6.10/0116-Fix-for-broken-GPIO-with-3.2-kernel.patch
diff --git a/patches/linux-3.6.7/0117-Revert-Disable-IRQs-in-dwc_otg_hcd_qh_free-because-D.patch b/patches/linux-3.6.10/0117-Revert-Disable-IRQs-in-dwc_otg_hcd_qh_free-because-D.patch
index ce9c7db..ce9c7db 100644
--- a/patches/linux-3.6.7/0117-Revert-Disable-IRQs-in-dwc_otg_hcd_qh_free-because-D.patch
+++ b/patches/linux-3.6.10/0117-Revert-Disable-IRQs-in-dwc_otg_hcd_qh_free-because-D.patch
diff --git a/patches/linux-3.6.7/0118-Regenerate-defconfigs-for-udpated-kernel-verision.patch b/patches/linux-3.6.10/0118-Regenerate-defconfigs-for-udpated-kernel-verision.patch
index ce3957d..ce3957d 100644
--- a/patches/linux-3.6.7/0118-Regenerate-defconfigs-for-udpated-kernel-verision.patch
+++ b/patches/linux-3.6.10/0118-Regenerate-defconfigs-for-udpated-kernel-verision.patch
diff --git a/patches/linux-3.6.7/0119-Another-fix-for-10-second-hang-on-closing-sound-driv.patch b/patches/linux-3.6.10/0119-Another-fix-for-10-second-hang-on-closing-sound-driv.patch
index d7790e6..d7790e6 100644
--- a/patches/linux-3.6.7/0119-Another-fix-for-10-second-hang-on-closing-sound-driv.patch
+++ b/patches/linux-3.6.10/0119-Another-fix-for-10-second-hang-on-closing-sound-driv.patch
diff --git a/patches/linux-3.6.7/0120-amba-pl011-Don-t-send-a-character-during-startup.patch b/patches/linux-3.6.10/0120-amba-pl011-Don-t-send-a-character-during-startup.patch
index d8e922a..d8e922a 100644
--- a/patches/linux-3.6.7/0120-amba-pl011-Don-t-send-a-character-during-startup.patch
+++ b/patches/linux-3.6.10/0120-amba-pl011-Don-t-send-a-character-during-startup.patch
diff --git a/patches/linux-3.6.7/0121-Revert-Regenerate-defconfigs-for-udpated-kernel-veri.patch b/patches/linux-3.6.10/0121-Revert-Regenerate-defconfigs-for-udpated-kernel-veri.patch
index 1b54d67..1b54d67 100644
--- a/patches/linux-3.6.7/0121-Revert-Regenerate-defconfigs-for-udpated-kernel-veri.patch
+++ b/patches/linux-3.6.10/0121-Revert-Regenerate-defconfigs-for-udpated-kernel-veri.patch
diff --git a/patches/linux-3.6.7/0122-Regenerate-defconfigs-for-updated-kernel-verision-tr.patch b/patches/linux-3.6.10/0122-Regenerate-defconfigs-for-updated-kernel-verision-tr.patch
index 9b34995..9b34995 100644
--- a/patches/linux-3.6.7/0122-Regenerate-defconfigs-for-updated-kernel-verision-tr.patch
+++ b/patches/linux-3.6.10/0122-Regenerate-defconfigs-for-updated-kernel-verision-tr.patch
diff --git a/patches/linux-3.6.7/0123-Read-memory-size-for-vc_mem-through-mailbox-property.patch b/patches/linux-3.6.10/0123-Read-memory-size-for-vc_mem-through-mailbox-property.patch
index a012c3b..a012c3b 100644
--- a/patches/linux-3.6.7/0123-Read-memory-size-for-vc_mem-through-mailbox-property.patch
+++ b/patches/linux-3.6.10/0123-Read-memory-size-for-vc_mem-through-mailbox-property.patch
diff --git a/patches/linux-3.6.7/0124-Revert-amba-pl011-Don-t-send-a-character-during-star.patch b/patches/linux-3.6.10/0124-Revert-amba-pl011-Don-t-send-a-character-during-star.patch
index b53d461..b53d461 100644
--- a/patches/linux-3.6.7/0124-Revert-amba-pl011-Don-t-send-a-character-during-star.patch
+++ b/patches/linux-3.6.10/0124-Revert-amba-pl011-Don-t-send-a-character-during-star.patch
diff --git a/patches/linux-3.6.7/0125-Update-to-dwc_otg-3.00.-Seems-to-be-a-very-minor-upd.patch b/patches/linux-3.6.10/0125-Update-to-dwc_otg-3.00.-Seems-to-be-a-very-minor-upd.patch
index 97ff7be..40c1aca 100644
--- a/patches/linux-3.6.7/0125-Update-to-dwc_otg-3.00.-Seems-to-be-a-very-minor-upd.patch
+++ b/patches/linux-3.6.10/0125-Update-to-dwc_otg-3.00.-Seems-to-be-a-very-minor-upd.patch
@@ -4,18 +4,63 @@ Subject: [PATCH] Update to dwc_otg 3.00. Seems to be a very minor update
  (mostly adding support for a newer version of hardware)
 
 ---
- drivers/usb/host/dwc_otg/doc/doxygen.cfg     |   2 +-
- drivers/usb/host/dwc_otg/dwc_otg_cil.c       | 341 +++++++++++-------
- drivers/usb/host/dwc_otg/dwc_otg_cil.h       |  15 +-
- drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c  | 204 ++++++++++-
- drivers/usb/host/dwc_otg/dwc_otg_core_if.h   |   6 +-
- drivers/usb/host/dwc_otg/dwc_otg_driver.c    |  15 +-
- drivers/usb/host/dwc_otg/dwc_otg_pcd.c       | 216 +++++------
- drivers/usb/host/dwc_otg/dwc_otg_pcd.h       |  10 +-
- drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c  | 520 ++++++++++++++++++++++-----
- drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c |  13 +-
- drivers/usb/host/dwc_otg/dwc_otg_regs.h      |  19 +-
- 11 files changed, 979 insertions(+), 382 deletions(-)
+ drivers/usb/host/dwc_common_port/Makefile          |   0
+ drivers/usb/host/dwc_common_port/Makefile.fbsd     |   0
+ drivers/usb/host/dwc_common_port/Makefile.linux    |   0
+ drivers/usb/host/dwc_common_port/changes.txt       |   0
+ drivers/usb/host/dwc_common_port/doc/doxygen.cfg   |   0
+ drivers/usb/host/dwc_common_port/dwc_cc.c          |   0
+ drivers/usb/host/dwc_common_port/dwc_cc.h          |   0
+ drivers/usb/host/dwc_common_port/dwc_common_fbsd.c |   0
+ .../usb/host/dwc_common_port/dwc_common_linux.c    |   0
+ drivers/usb/host/dwc_common_port/dwc_common_nbsd.c |   0
+ drivers/usb/host/dwc_common_port/dwc_crypto.c      |   0
+ drivers/usb/host/dwc_common_port/dwc_crypto.h      |   0
+ drivers/usb/host/dwc_common_port/dwc_dh.c          |   0
+ drivers/usb/host/dwc_common_port/dwc_dh.h          |   0
+ drivers/usb/host/dwc_common_port/dwc_list.h        |   0
+ drivers/usb/host/dwc_common_port/dwc_mem.c         |   0
+ drivers/usb/host/dwc_common_port/dwc_modpow.c      |   0
+ drivers/usb/host/dwc_common_port/dwc_modpow.h      |   0
+ drivers/usb/host/dwc_common_port/dwc_notifier.c    |   0
+ drivers/usb/host/dwc_common_port/dwc_notifier.h    |   0
+ drivers/usb/host/dwc_common_port/dwc_os.h          |   0
+ drivers/usb/host/dwc_common_port/usb.h             |   0
+ drivers/usb/host/dwc_otg/Makefile                  |   0
+ drivers/usb/host/dwc_otg/doc/doxygen.cfg           |   2 +-
+ drivers/usb/host/dwc_otg/dwc_cfi_common.h          |   0
+ drivers/usb/host/dwc_otg/dwc_otg_adp.c             |   0
+ drivers/usb/host/dwc_otg/dwc_otg_adp.h             |   0
+ drivers/usb/host/dwc_otg/dwc_otg_attr.c            |   0
+ drivers/usb/host/dwc_otg/dwc_otg_attr.h            |   0
+ drivers/usb/host/dwc_otg/dwc_otg_cfi.c             |   0
+ drivers/usb/host/dwc_otg/dwc_otg_cfi.h             |   0
+ drivers/usb/host/dwc_otg/dwc_otg_cil.c             | 341 ++++++++------
+ drivers/usb/host/dwc_otg/dwc_otg_cil.h             |  15 +-
+ drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c        | 204 +++++++-
+ drivers/usb/host/dwc_otg/dwc_otg_core_if.h         |   6 +-
+ drivers/usb/host/dwc_otg/dwc_otg_dbg.h             |   0
+ drivers/usb/host/dwc_otg/dwc_otg_driver.c          |  15 +-
+ drivers/usb/host/dwc_otg/dwc_otg_driver.h          |   0
+ drivers/usb/host/dwc_otg/dwc_otg_hcd.c             |   0
+ drivers/usb/host/dwc_otg/dwc_otg_hcd.h             |   0
+ drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c        |   0
+ drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h          |   0
+ drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c        |   0
+ drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c       |   0
+ drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c       |   0
+ drivers/usb/host/dwc_otg/dwc_otg_os_dep.h          |   0
+ drivers/usb/host/dwc_otg/dwc_otg_pcd.c             | 216 ++++-----
+ drivers/usb/host/dwc_otg/dwc_otg_pcd.h             |  10 +-
+ drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h          |   0
+ drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c        | 520 +++++++++++++++++----
+ drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c       |  13 +-
+ drivers/usb/host/dwc_otg/dwc_otg_regs.h            |  19 +-
+ drivers/usb/host/dwc_otg/test/Makefile             |   0
+ drivers/usb/host/dwc_otg/test/dwc_otg_test.pm      |   0
+ drivers/usb/host/dwc_otg/test/test_mod_param.pl    |   0
+ drivers/usb/host/dwc_otg/test/test_sysfs.pl        |   0
+ 56 files changed, 979 insertions(+), 382 deletions(-)
  mode change 100755 => 100644 drivers/usb/host/dwc_common_port/Makefile
  mode change 100755 => 100644 drivers/usb/host/dwc_common_port/Makefile.fbsd
  mode change 100755 => 100644 drivers/usb/host/dwc_common_port/Makefile.linux
diff --git a/patches/linux-3.6.7/0126-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch b/patches/linux-3.6.10/0126-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch
index 6fbd0d0..6fbd0d0 100644
--- a/patches/linux-3.6.7/0126-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch
+++ b/patches/linux-3.6.10/0126-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch
diff --git a/patches/linux-3.6.7/0127-Switch-of-tracing-options-in-kernel.-Costs-20-in-ipe.patch b/patches/linux-3.6.10/0127-Switch-of-tracing-options-in-kernel.-Costs-20-in-ipe.patch
index 59546e0..59546e0 100644
--- a/patches/linux-3.6.7/0127-Switch-of-tracing-options-in-kernel.-Costs-20-in-ipe.patch
+++ b/patches/linux-3.6.10/0127-Switch-of-tracing-options-in-kernel.-Costs-20-in-ipe.patch
diff --git a/patches/linux-3.6.7/0128-Turn-on-microframe_schedule-by-default.-Can-still-be.patch b/patches/linux-3.6.10/0128-Turn-on-microframe_schedule-by-default.-Can-still-be.patch
index 8e8cfd4..8743b26 100644
--- a/patches/linux-3.6.7/0128-Turn-on-microframe_schedule-by-default.-Can-still-be.patch
+++ b/patches/linux-3.6.10/0128-Turn-on-microframe_schedule-by-default.-Can-still-be.patch
@@ -1,7 +1,7 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 24 Aug 2012 23:25:13 +0100
-Subject: [PATCH] Turn on microframe_schedule by default. Can still be
- disabled on command line
+Subject: [PATCH] Turn on microframe_schedule by default. Can still be disabled
+ on command line
 
 ---
  drivers/usb/host/dwc_otg/dwc_otg_driver.c | 2 +-
diff --git a/patches/linux-3.6.7/0129-Add-low-latency-mode-to-sdcard-driver.-Enable-with-s.patch b/patches/linux-3.6.10/0129-Add-low-latency-mode-to-sdcard-driver.-Enable-with-s.patch
index 0d348b0..0d348b0 100644
--- a/patches/linux-3.6.7/0129-Add-low-latency-mode-to-sdcard-driver.-Enable-with-s.patch
+++ b/patches/linux-3.6.10/0129-Add-low-latency-mode-to-sdcard-driver.-Enable-with-s.patch
diff --git a/patches/linux-3.6.7/0130-Fix-build-for-non-preempt-case.-Fix-warning.patch b/patches/linux-3.6.10/0130-Fix-build-for-non-preempt-case.-Fix-warning.patch
index 55e5dd7..55e5dd7 100644
--- a/patches/linux-3.6.7/0130-Fix-build-for-non-preempt-case.-Fix-warning.patch
+++ b/patches/linux-3.6.10/0130-Fix-build-for-non-preempt-case.-Fix-warning.patch
diff --git a/patches/linux-3.6.7/0131-Add-config-options-to-allow-iotop-to-run.patch b/patches/linux-3.6.10/0131-Add-config-options-to-allow-iotop-to-run.patch
index 7d814fc..7d814fc 100644
--- a/patches/linux-3.6.7/0131-Add-config-options-to-allow-iotop-to-run.patch
+++ b/patches/linux-3.6.10/0131-Add-config-options-to-allow-iotop-to-run.patch
diff --git a/patches/linux-3.6.7/0132-Fix-for-vmalloc-failure-with-modprobe-and-cutdown-ke.patch b/patches/linux-3.6.10/0132-Fix-for-vmalloc-failure-with-modprobe-and-cutdown-ke.patch
index afa6c07..121ca5e 100644
--- a/patches/linux-3.6.7/0132-Fix-for-vmalloc-failure-with-modprobe-and-cutdown-ke.patch
+++ b/patches/linux-3.6.10/0132-Fix-for-vmalloc-failure-with-modprobe-and-cutdown-ke.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Fix for vmalloc failure with modprobe and cutdown kernel
  1 file changed, 16 insertions(+), 13 deletions(-)
 
 diff --git a/kernel/module.c b/kernel/module.c
-index 9ad9ee9..9825f72 100644
+index 2a15c59..3e53997 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -2675,20 +2675,23 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2680,20 +2680,23 @@ static int move_module(struct module *mod, struct load_info *info)
  	memset(ptr, 0, mod->core_size);
  	mod->module_core = ptr;
  
diff --git a/patches/linux-3.6.7/0133-Enable-low-latency-mode-by-default-in-sdcard-driver..patch b/patches/linux-3.6.10/0133-Enable-low-latency-mode-by-default-in-sdcard-driver..patch
index d69ecec..d69ecec 100644
--- a/patches/linux-3.6.7/0133-Enable-low-latency-mode-by-default-in-sdcard-driver..patch
+++ b/patches/linux-3.6.10/0133-Enable-low-latency-mode-by-default-in-sdcard-driver..patch
diff --git a/patches/linux-3.6.7/0134-Add-FIQ-patch-to-dwc_otg-driver.-Enable-with-dwc_otg.patch b/patches/linux-3.6.10/0134-Add-FIQ-patch-to-dwc_otg-driver.-Enable-with-dwc_otg.patch
index 1d6dbf2..b0a85c2 100644
--- a/patches/linux-3.6.7/0134-Add-FIQ-patch-to-dwc_otg-driver.-Enable-with-dwc_otg.patch
+++ b/patches/linux-3.6.10/0134-Add-FIQ-patch-to-dwc_otg-driver.-Enable-with-dwc_otg.patch
@@ -1,8 +1,8 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 1 Sep 2012 00:29:19 +0100
 Subject: [PATCH] Add FIQ patch to dwc_otg driver. Enable with
- dwc_otg.fiq_fix_enable=1. Should give about 10% more ARM
- performance. Thanks to Gordon and Costas
+ dwc_otg.fiq_fix_enable=1. Should give about 10% more ARM performance. Thanks
+ to Gordon and Costas
 
 ---
  arch/arm/Kconfig                              |   3 +-
@@ -31,7 +31,7 @@ Subject: [PATCH] Add FIQ patch to dwc_otg driver. Enable with
  create mode 100755 drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h
 
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index fd49001..111f1b0 100644
+index 64483bf..ac04a18 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
 @@ -1,4 +1,4 @@
@@ -40,7 +40,7 @@ index fd49001..111f1b0 100644
  	bool
  	default y
  	select ARCH_HAVE_CUSTOM_GPIO_H
-@@ -1010,6 +1010,7 @@ config ARCH_BCM2708
+@@ -1011,6 +1011,7 @@ config ARCH_BCM2708
  	select ARM_ERRATA_411920
  	select MACH_BCM2708
  	select VC4
diff --git a/patches/linux-3.6.7/0135-Fix-typo.patch b/patches/linux-3.6.10/0135-Fix-typo.patch
index e5f458d..c33a89b 100644
--- a/patches/linux-3.6.7/0135-Fix-typo.patch
+++ b/patches/linux-3.6.10/0135-Fix-typo.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix typo
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 111f1b0..4dd71eb 100644
+index ac04a18..58f96f6 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
 @@ -1,4 +1,4 @@
diff --git a/patches/linux-3.6.7/0136-Add-non-mainline-source-for-rtl8188cu-wireless-drive.patch b/patches/linux-3.6.10/0136-Add-non-mainline-source-for-rtl8188cu-wireless-drive.patch
index 157b87b..4ca82f2 100644
--- a/patches/linux-3.6.7/0136-Add-non-mainline-source-for-rtl8188cu-wireless-drive.patch
+++ b/patches/linux-3.6.10/0136-Add-non-mainline-source-for-rtl8188cu-wireless-drive.patch
@@ -1,7 +1,7 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 3 Sep 2012 17:10:23 +0100
-Subject: [PATCH] Add non-mainline source for rtl8188cu wireless driver as
- this is widely used. Disabled older rtlwifi driver
+Subject: [PATCH] Add non-mainline source for rtl8188cu wireless driver as this
+ is widely used. Disabled older rtlwifi driver
 
 ---
  drivers/net/wireless/Kconfig                       |     3 +-
diff --git a/patches/linux-3.6.7/0137-Add-verious-user-config-requests.patch b/patches/linux-3.6.10/0137-Add-verious-user-config-requests.patch
index a6c5dd1..daa698c 100644
--- a/patches/linux-3.6.7/0137-Add-verious-user-config-requests.patch
+++ b/patches/linux-3.6.10/0137-Add-verious-user-config-requests.patch
@@ -1,8 +1,8 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 3 Sep 2012 23:44:52 +0100
 Subject: [PATCH] Add verious user config requests. CONFIG_DEVTMPFS_MOUNT,
- CONFIG_NFS_V4_1=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y,
- drbd and IPSEC modules
+ CONFIG_NFS_V4_1=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y, drbd and IPSEC
+ modules
 
 ---
  arch/arm/configs/bcmrpi_defconfig | 32 +++++++++++++++++++++++++-------
diff --git a/patches/linux-3.6.7/0138-Don-t-believe-KDIR-is-required-when-building-as-part.patch b/patches/linux-3.6.10/0138-Don-t-believe-KDIR-is-required-when-building-as-part.patch
index a20e558..a20e558 100644
--- a/patches/linux-3.6.7/0138-Don-t-believe-KDIR-is-required-when-building-as-part.patch
+++ b/patches/linux-3.6.10/0138-Don-t-believe-KDIR-is-required-when-building-as-part.patch
diff --git a/patches/linux-3.6.7/0139-Avoid-dynamic-memory-allocation-for-channel-lock-in-.patch b/patches/linux-3.6.10/0139-Avoid-dynamic-memory-allocation-for-channel-lock-in-.patch
index 8dbf226..8dbf226 100644
--- a/patches/linux-3.6.7/0139-Avoid-dynamic-memory-allocation-for-channel-lock-in-.patch
+++ b/patches/linux-3.6.10/0139-Avoid-dynamic-memory-allocation-for-channel-lock-in-.patch
diff --git a/patches/linux-3.6.7/0140-Add-cpufreq-driver.patch b/patches/linux-3.6.10/0140-Add-cpufreq-driver.patch
index df06fac..9d65631 100644
--- a/patches/linux-3.6.7/0140-Add-cpufreq-driver.patch
+++ b/patches/linux-3.6.10/0140-Add-cpufreq-driver.patch
@@ -15,10 +15,10 @@ Subject: [PATCH] Add cpufreq driver
  create mode 100755 drivers/cpufreq/bcm2835-cpufreq.c
 
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 4dd71eb..14afaea 100644
+index 58f96f6..0d8c3b1 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1006,6 +1006,7 @@ config ARCH_BCM2708
+@@ -1007,6 +1007,7 @@ config ARCH_BCM2708
  	select HAVE_SCHED_CLOCK
  	select NEED_MACH_MEMORY_H
  	select CLKDEV_LOOKUP
diff --git a/patches/linux-3.6.7/0141-Tidy-up-debug-messages.patch b/patches/linux-3.6.10/0141-Tidy-up-debug-messages.patch
index aab7536..aab7536 100644
--- a/patches/linux-3.6.7/0141-Tidy-up-debug-messages.patch
+++ b/patches/linux-3.6.10/0141-Tidy-up-debug-messages.patch
diff --git a/patches/linux-3.6.7/0142-Enable-fiq-fix-by-default.-Add-NAK-holdoff-scheme.-E.patch b/patches/linux-3.6.10/0142-Enable-fiq-fix-by-default.-Add-NAK-holdoff-scheme.-E.patch
index 3274ebd..6b88b23 100644
--- a/patches/linux-3.6.7/0142-Enable-fiq-fix-by-default.-Add-NAK-holdoff-scheme.-E.patch
+++ b/patches/linux-3.6.10/0142-Enable-fiq-fix-by-default.-Add-NAK-holdoff-scheme.-E.patch
@@ -1,8 +1,7 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 13 Sep 2012 20:40:08 +0100
-Subject: [PATCH] Enable fiq fix by default. Add NAK holdoff scheme. Enabled
- by default, disable with dwc_otg.nak_holdoff_enable=0.
- Thanks gsh
+Subject: [PATCH] Enable fiq fix by default. Add NAK holdoff scheme. Enabled by
+ default, disable with dwc_otg.nak_holdoff_enable=0. Thanks gsh
 
 ---
  drivers/usb/host/dwc_otg/dwc_otg_driver.c    |  9 +++++++--
diff --git a/patches/linux-3.6.7/0143-Added-hwmon-thermal-driver-for-reporting-core-temper.patch b/patches/linux-3.6.10/0143-Added-hwmon-thermal-driver-for-reporting-core-temper.patch
index b4de9e9..b4de9e9 100644
--- a/patches/linux-3.6.7/0143-Added-hwmon-thermal-driver-for-reporting-core-temper.patch
+++ b/patches/linux-3.6.10/0143-Added-hwmon-thermal-driver-for-reporting-core-temper.patch
diff --git a/patches/linux-3.6.7/0144-Add-config-options-for-thermal-sensor-L2TP-RT2800USB.patch b/patches/linux-3.6.10/0144-Add-config-options-for-thermal-sensor-L2TP-RT2800USB.patch
index 0c048a8..575264d 100644
--- a/patches/linux-3.6.7/0144-Add-config-options-for-thermal-sensor-L2TP-RT2800USB.patch
+++ b/patches/linux-3.6.10/0144-Add-config-options-for-thermal-sensor-L2TP-RT2800USB.patch
@@ -1,8 +1,7 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 14 Sep 2012 16:19:10 +0100
 Subject: [PATCH] Add config options for thermal sensor, L2TP,
- RT2800USB_UNKNOWN, and various I2C and SPI RTCs. Tidy of
- thermal driver.
+ RT2800USB_UNKNOWN, and various I2C and SPI RTCs. Tidy of thermal driver.
 
 ---
  arch/arm/configs/bcmrpi_defconfig | 31 +++++++++++++++++++++++++++++++
diff --git a/patches/linux-3.6.7/0145-Remove-some-unnecessary-dmesg-output.patch b/patches/linux-3.6.10/0145-Remove-some-unnecessary-dmesg-output.patch
index abac942..abac942 100644
--- a/patches/linux-3.6.7/0145-Remove-some-unnecessary-dmesg-output.patch
+++ b/patches/linux-3.6.10/0145-Remove-some-unnecessary-dmesg-output.patch
diff --git a/patches/linux-3.6.7/0146-Switch-to-powersave-governor.-We-ll-enable-ondemand-.patch b/patches/linux-3.6.10/0146-Switch-to-powersave-governor.-We-ll-enable-ondemand-.patch
index 19aebba..19aebba 100644
--- a/patches/linux-3.6.7/0146-Switch-to-powersave-governor.-We-ll-enable-ondemand-.patch
+++ b/patches/linux-3.6.10/0146-Switch-to-powersave-governor.-We-ll-enable-ondemand-.patch
diff --git a/patches/linux-3.6.7/0147-Enable-multiple-ALSA-channels.patch b/patches/linux-3.6.10/0147-Enable-multiple-ALSA-channels.patch
index 145c1ea..145c1ea 100644
--- a/patches/linux-3.6.7/0147-Enable-multiple-ALSA-channels.patch
+++ b/patches/linux-3.6.10/0147-Enable-multiple-ALSA-channels.patch
diff --git a/patches/linux-3.6.7/0148-Remove-vcos-abstraction-layer-from-ALSA-driver.-Than.patch b/patches/linux-3.6.10/0148-Remove-vcos-abstraction-layer-from-ALSA-driver.-Than.patch
index a773a68..48a0dee 100644
--- a/patches/linux-3.6.7/0148-Remove-vcos-abstraction-layer-from-ALSA-driver.-Than.patch
+++ b/patches/linux-3.6.10/0148-Remove-vcos-abstraction-layer-from-ALSA-driver.-Than.patch
@@ -1,7 +1,6 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 20 Sep 2012 21:46:14 +0100
-Subject: [PATCH] Remove vcos abstraction layer from ALSA driver. Thanks
- Dorian
+Subject: [PATCH] Remove vcos abstraction layer from ALSA driver. Thanks Dorian
 
 ---
  sound/arm/bcm2835-vchiq.c | 149 ++++++++++++++++++++++------------------------
diff --git a/patches/linux-3.6.7/0149-Fix-Kernel-OOPS-in-SDHCI-on-boot-with-the-llm-patch..patch b/patches/linux-3.6.10/0149-Fix-Kernel-OOPS-in-SDHCI-on-boot-with-the-llm-patch..patch
index d7e8f07..d7e8f07 100644
--- a/patches/linux-3.6.7/0149-Fix-Kernel-OOPS-in-SDHCI-on-boot-with-the-llm-patch..patch
+++ b/patches/linux-3.6.10/0149-Fix-Kernel-OOPS-in-SDHCI-on-boot-with-the-llm-patch..patch
diff --git a/patches/linux-3.6.7/0150-Use-system-timer-for-udelay-so-unaffected-by-cpufreq.patch b/patches/linux-3.6.10/0150-Use-system-timer-for-udelay-so-unaffected-by-cpufreq.patch
index 0afef5d..0afef5d 100644
--- a/patches/linux-3.6.7/0150-Use-system-timer-for-udelay-so-unaffected-by-cpufreq.patch
+++ b/patches/linux-3.6.10/0150-Use-system-timer-for-udelay-so-unaffected-by-cpufreq.patch
diff --git a/patches/linux-3.6.7/0151-Move-__delay-function-into-assembly-to-get-accurate-.patch b/patches/linux-3.6.10/0151-Move-__delay-function-into-assembly-to-get-accurate-.patch
index 1b8a9b1..1b8a9b1 100644
--- a/patches/linux-3.6.7/0151-Move-__delay-function-into-assembly-to-get-accurate-.patch
+++ b/patches/linux-3.6.10/0151-Move-__delay-function-into-assembly-to-get-accurate-.patch
diff --git a/patches/linux-3.6.7/0152-set-i2c-speed-via-module-parameter-or-menuconfig.-Th.patch b/patches/linux-3.6.10/0152-set-i2c-speed-via-module-parameter-or-menuconfig.-Th.patch
index 61ede15..61ede15 100644
--- a/patches/linux-3.6.7/0152-set-i2c-speed-via-module-parameter-or-menuconfig.-Th.patch
+++ b/patches/linux-3.6.10/0152-set-i2c-speed-via-module-parameter-or-menuconfig.-Th.patch
diff --git a/patches/linux-3.6.7/0153-Allow-the-number-of-cycles-delay-between-sdcard-peri.patch b/patches/linux-3.6.10/0153-Allow-the-number-of-cycles-delay-between-sdcard-peri.patch
index 5023e16..e0df1d8 100644
--- a/patches/linux-3.6.7/0153-Allow-the-number-of-cycles-delay-between-sdcard-peri.patch
+++ b/patches/linux-3.6.10/0153-Allow-the-number-of-cycles-delay-between-sdcard-peri.patch
@@ -1,8 +1,7 @@
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 3 Oct 2012 21:31:48 +0100
 Subject: [PATCH] Allow the number of cycles delay between sdcard peripheral
- writes to be specified on command line with
- sdhci-bcm2708.cycle_delay
+ writes to be specified on command line with sdhci-bcm2708.cycle_delay
 
 ---
  drivers/mmc/host/sdhci-bcm2708.c | 5 ++++-
diff --git a/patches/linux-3.6.7/0154-Fix-vc-mem-by-using-module-parameters.patch b/patches/linux-3.6.10/0154-Fix-vc-mem-by-using-module-parameters.patch
index f7038d8..f7038d8 100644
--- a/patches/linux-3.6.7/0154-Fix-vc-mem-by-using-module-parameters.patch
+++ b/patches/linux-3.6.10/0154-Fix-vc-mem-by-using-module-parameters.patch
diff --git a/patches/linux-3.6.7/0155-Move-to-version-5-of-VCHIQ.-Note-this-requires-a-cor.patch b/patches/linux-3.6.10/0155-Move-to-version-5-of-VCHIQ.-Note-this-requires-a-cor.patch
index 59bcdd3..59bcdd3 100644
--- a/patches/linux-3.6.7/0155-Move-to-version-5-of-VCHIQ.-Note-this-requires-a-cor.patch
+++ b/patches/linux-3.6.10/0155-Move-to-version-5-of-VCHIQ.-Note-this-requires-a-cor.patch
diff --git a/patches/linux-3.6.7/0156-Add-in-missed-vchiq-files.patch b/patches/linux-3.6.10/0156-Add-in-missed-vchiq-files.patch
index 2f9e1a4..2f9e1a4 100644
--- a/patches/linux-3.6.7/0156-Add-in-missed-vchiq-files.patch
+++ b/patches/linux-3.6.10/0156-Add-in-missed-vchiq-files.patch
diff --git a/patches/linux-3.6.7/0157-Make-vchiq-enabled-by-default.-Tidy-Kconfig-file.patch b/patches/linux-3.6.10/0157-Make-vchiq-enabled-by-default.-Tidy-Kconfig-file.patch
index 2993506..2993506 100644
--- a/patches/linux-3.6.7/0157-Make-vchiq-enabled-by-default.-Tidy-Kconfig-file.patch
+++ b/patches/linux-3.6.10/0157-Make-vchiq-enabled-by-default.-Tidy-Kconfig-file.patch
diff --git a/patches/linux-3.6.7/0158-Support-dummy-vc-mem-ioctl-used-by-vcdbg.patch b/patches/linux-3.6.10/0158-Support-dummy-vc-mem-ioctl-used-by-vcdbg.patch
index 7549236..7549236 100644
--- a/patches/linux-3.6.7/0158-Support-dummy-vc-mem-ioctl-used-by-vcdbg.patch
+++ b/patches/linux-3.6.10/0158-Support-dummy-vc-mem-ioctl-used-by-vcdbg.patch
diff --git a/patches/linux-3.6.7/0159-Remove-BUG-call-from-vchiq-that-is-trigger-when-alsa.patch b/patches/linux-3.6.10/0159-Remove-BUG-call-from-vchiq-that-is-trigger-when-alsa.patch
index d6794cd..d6794cd 100644
--- a/patches/linux-3.6.7/0159-Remove-BUG-call-from-vchiq-that-is-trigger-when-alsa.patch
+++ b/patches/linux-3.6.10/0159-Remove-BUG-call-from-vchiq-that-is-trigger-when-alsa.patch
diff --git a/patches/linux-3.6.7/0160-Fix-up-issues-with-rebase.patch b/patches/linux-3.6.10/0160-Fix-up-issues-with-rebase.patch
index a689c59..a689c59 100644
--- a/patches/linux-3.6.7/0160-Fix-up-issues-with-rebase.patch
+++ b/patches/linux-3.6.10/0160-Fix-up-issues-with-rebase.patch
diff --git a/patches/linux-3.6.7/0161-Add-vc_cma-driver-to-enable-use-of-CMA.patch b/patches/linux-3.6.10/0161-Add-vc_cma-driver-to-enable-use-of-CMA.patch
index afc7d79..afc7d79 100644
--- a/patches/linux-3.6.7/0161-Add-vc_cma-driver-to-enable-use-of-CMA.patch
+++ b/patches/linux-3.6.10/0161-Add-vc_cma-driver-to-enable-use-of-CMA.patch
diff --git a/patches/linux-3.6.7/0162-Add-missing-CMA-files.patch b/patches/linux-3.6.10/0162-Add-missing-CMA-files.patch
index 72fc13c..72fc13c 100644
--- a/patches/linux-3.6.7/0162-Add-missing-CMA-files.patch
+++ b/patches/linux-3.6.10/0162-Add-missing-CMA-files.patch
diff --git a/patches/linux-3.6.7/0163-Fix-reboot-with-new-restart-method-of-machine-driver.patch b/patches/linux-3.6.10/0163-Fix-reboot-with-new-restart-method-of-machine-driver.patch
index f864d60..f864d60 100644
--- a/patches/linux-3.6.7/0163-Fix-reboot-with-new-restart-method-of-machine-driver.patch
+++ b/patches/linux-3.6.10/0163-Fix-reboot-with-new-restart-method-of-machine-driver.patch
diff --git a/patches/linux-3.6.7/0164-smsc95xx-sleep-before-read-for-lengthy-operations.patch b/patches/linux-3.6.10/0164-smsc95xx-sleep-before-read-for-lengthy-operations.patch
index eb7b4d8..eb7b4d8 100644
--- a/patches/linux-3.6.7/0164-smsc95xx-sleep-before-read-for-lengthy-operations.patch
+++ b/patches/linux-3.6.10/0164-smsc95xx-sleep-before-read-for-lengthy-operations.patch
diff --git a/patches/linux-3.6.7/0165-smsc95xx-remove-unnecessary-variables.patch b/patches/linux-3.6.10/0165-smsc95xx-remove-unnecessary-variables.patch
index d45ee58..d45ee58 100644
--- a/patches/linux-3.6.7/0165-smsc95xx-remove-unnecessary-variables.patch
+++ b/patches/linux-3.6.10/0165-smsc95xx-remove-unnecessary-variables.patch
diff --git a/patches/linux-3.6.7/0166-smsc95xx-check-return-code-from-control-messages.patch b/patches/linux-3.6.10/0166-smsc95xx-check-return-code-from-control-messages.patch
index d194d98..d194d98 100644
--- a/patches/linux-3.6.7/0166-smsc95xx-check-return-code-from-control-messages.patch
+++ b/patches/linux-3.6.10/0166-smsc95xx-check-return-code-from-control-messages.patch
diff --git a/patches/linux-3.6.7/0167-smsc95xx-fix-resume-when-usb-device-is-reset.patch b/patches/linux-3.6.10/0167-smsc95xx-fix-resume-when-usb-device-is-reset.patch
index 9284a08..9284a08 100644
--- a/patches/linux-3.6.7/0167-smsc95xx-fix-resume-when-usb-device-is-reset.patch
+++ b/patches/linux-3.6.10/0167-smsc95xx-fix-resume-when-usb-device-is-reset.patch
diff --git a/patches/linux-3.6.7/0168-smsc95xx-enable-power-saving-mode-during-system-susp.patch b/patches/linux-3.6.10/0168-smsc95xx-enable-power-saving-mode-during-system-susp.patch
index c4c17df..c4c17df 100644
--- a/patches/linux-3.6.7/0168-smsc95xx-enable-power-saving-mode-during-system-susp.patch
+++ b/patches/linux-3.6.10/0168-smsc95xx-enable-power-saving-mode-during-system-susp.patch
diff --git a/patches/linux-3.6.7/0169-smsc95xx-add-wol-magic-packet-support.patch b/patches/linux-3.6.10/0169-smsc95xx-add-wol-magic-packet-support.patch
index 6fc371a..6fc371a 100644
--- a/patches/linux-3.6.7/0169-smsc95xx-add-wol-magic-packet-support.patch
+++ b/patches/linux-3.6.10/0169-smsc95xx-add-wol-magic-packet-support.patch
diff --git a/patches/linux-3.6.7/0170-smsc95xx-fix-tx-checksum-offload-for-big-endian.patch b/patches/linux-3.6.10/0170-smsc95xx-fix-tx-checksum-offload-for-big-endian.patch
index bf2ffa9..bf2ffa9 100644
--- a/patches/linux-3.6.7/0170-smsc95xx-fix-tx-checksum-offload-for-big-endian.patch
+++ b/patches/linux-3.6.10/0170-smsc95xx-fix-tx-checksum-offload-for-big-endian.patch
diff --git a/patches/linux-3.6.7/0171-Update-to-latest-vchiq.patch b/patches/linux-3.6.10/0171-Update-to-latest-vchiq.patch
index d1365b9..d1365b9 100644
--- a/patches/linux-3.6.7/0171-Update-to-latest-vchiq.patch
+++ b/patches/linux-3.6.10/0171-Update-to-latest-vchiq.patch
diff --git a/patches/linux-3.6.7/0172-Make-sure-we-wait-for-the-reset-to-finish.patch b/patches/linux-3.6.10/0172-Make-sure-we-wait-for-the-reset-to-finish.patch
index 0fce113..0fce113 100644
--- a/patches/linux-3.6.7/0172-Make-sure-we-wait-for-the-reset-to-finish.patch
+++ b/patches/linux-3.6.10/0172-Make-sure-we-wait-for-the-reset-to-finish.patch
diff --git a/patches/linux-3.6.7/0173-Add-missing-pctv452e-DVB-module.patch b/patches/linux-3.6.10/0173-Add-missing-pctv452e-DVB-module.patch
index 01f2cbb..01f2cbb 100644
--- a/patches/linux-3.6.7/0173-Add-missing-pctv452e-DVB-module.patch
+++ b/patches/linux-3.6.10/0173-Add-missing-pctv452e-DVB-module.patch
diff --git a/patches/linux-3.6.7/0174-Add-Simon-Hall-s-dma-helper-module-useful-in-future-.patch b/patches/linux-3.6.10/0174-Add-Simon-Hall-s-dma-helper-module-useful-in-future-.patch
index 5bdb234..5bdb234 100644
--- a/patches/linux-3.6.7/0174-Add-Simon-Hall-s-dma-helper-module-useful-in-future-.patch
+++ b/patches/linux-3.6.10/0174-Add-Simon-Hall-s-dma-helper-module-useful-in-future-.patch
diff --git a/patches/linux-3.6.7/0175-Add-missing-options-from-more-recent-3.2.27-kernel-c.patch b/patches/linux-3.6.10/0175-Add-missing-options-from-more-recent-3.2.27-kernel-c.patch
index 05aa8f1..05aa8f1 100644
--- a/patches/linux-3.6.7/0175-Add-missing-options-from-more-recent-3.2.27-kernel-c.patch
+++ b/patches/linux-3.6.10/0175-Add-missing-options-from-more-recent-3.2.27-kernel-c.patch
diff --git a/patches/linux-3.6.7/0176-lirc-added-support-for-RaspberryPi-GPIO.patch b/patches/linux-3.6.10/0176-lirc-added-support-for-RaspberryPi-GPIO.patch
index decd167..decd167 100644
--- a/patches/linux-3.6.7/0176-lirc-added-support-for-RaspberryPi-GPIO.patch
+++ b/patches/linux-3.6.10/0176-lirc-added-support-for-RaspberryPi-GPIO.patch
diff --git a/patches/linux-3.6.7/0177-Enable-building-of-lirc-rpi.patch b/patches/linux-3.6.10/0177-Enable-building-of-lirc-rpi.patch
index 9c0f6f5..9c0f6f5 100644
--- a/patches/linux-3.6.7/0177-Enable-building-of-lirc-rpi.patch
+++ b/patches/linux-3.6.10/0177-Enable-building-of-lirc-rpi.patch
diff --git a/patches/linux-3.6.10/0178-Update-list-of-modules-build-with-next-kernel.-Fixes.patch b/patches/linux-3.6.10/0178-Update-list-of-modules-build-with-next-kernel.-Fixes.patch
new file mode 100644
index 0000000..e898f3f
--- /dev/null
+++ b/patches/linux-3.6.10/0178-Update-list-of-modules-build-with-next-kernel.-Fixes.patch
@@ -0,0 +1,313 @@
+From: popcornmix <popcornmix@gmail.com>
+Date: Wed, 21 Nov 2012 13:23:02 +0000
+Subject: [PATCH] Update list of modules build with next kernel. Fixes missing
+ uvcvideo amongst others
+
+---
+ arch/arm/configs/bcmrpi_defconfig | 228 +++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 222 insertions(+), 6 deletions(-)
+
+diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
+index 12e6d92..4db7a00 100644
+--- a/arch/arm/configs/bcmrpi_defconfig
++++ b/arch/arm/configs/bcmrpi_defconfig
+@@ -33,7 +33,6 @@ CONFIG_MODULES=y
+ CONFIG_MODULE_UNLOAD=y
+ CONFIG_MODVERSIONS=y
+ CONFIG_MODULE_SRCVERSION_ALL=y
+-# CONFIG_BLK_DEV_BSG is not set
+ CONFIG_BLK_DEV_THROTTLING=y
+ CONFIG_PARTITION_ADVANCED=y
+ CONFIG_MAC_PARTITION=y
+@@ -331,8 +330,6 @@ CONFIG_NFC=m
+ CONFIG_NFC_PN533=m
+ CONFIG_DEVTMPFS=y
+ CONFIG_DEVTMPFS_MOUNT=y
+-CONFIG_CMA=y
+-CONFIG_CMA_DEBUG=y
+ CONFIG_BLK_DEV_LOOP=y
+ CONFIG_BLK_DEV_CRYPTOLOOP=m
+ CONFIG_BLK_DEV_DRBD=m
+@@ -346,7 +343,8 @@ CONFIG_CHR_DEV_ST=m
+ CONFIG_CHR_DEV_OSST=m
+ CONFIG_BLK_DEV_SR=m
+ CONFIG_SCSI_MULTI_LUN=y
+-# CONFIG_SCSI_LOWLEVEL is not set
++CONFIG_SCSI_ISCSI_ATTRS=y
++CONFIG_ISCSI_TCP=m
+ CONFIG_MD=y
+ CONFIG_BLK_DEV_DM=m
+ CONFIG_DM_CRYPT=m
+@@ -461,8 +459,6 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+ CONFIG_TTY_PRINTK=y
+ # CONFIG_HW_RANDOM is not set
+ CONFIG_RAW_DRIVER=y
+-CONFIG_BRCM_CHAR_DRIVERS=y
+-CONFIG_BCM_VC_CMA=y
+ CONFIG_I2C=y
+ CONFIG_I2C_CHARDEV=m
+ CONFIG_I2C_BCM2708=m
+@@ -490,8 +486,216 @@ CONFIG_THERMAL_BCM2835=y
+ CONFIG_WATCHDOG=y
+ CONFIG_BCM2708_WDT=m
+ CONFIG_MEDIA_SUPPORT=m
++CONFIG_MEDIA_CAMERA_SUPPORT=y
++CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
++CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
++CONFIG_MEDIA_RADIO_SUPPORT=y
++CONFIG_MEDIA_RC_SUPPORT=y
++CONFIG_MEDIA_CONTROLLER=y
++CONFIG_LIRC=m
++CONFIG_RC_DEVICES=y
++CONFIG_RC_ATI_REMOTE=m
++CONFIG_IR_IMON=m
++CONFIG_IR_MCEUSB=m
++CONFIG_IR_REDRAT3=m
++CONFIG_IR_STREAMZAP=m
++CONFIG_IR_IGUANA=m
++CONFIG_RC_LOOPBACK=m
++CONFIG_IR_GPIO_CIR=m
++CONFIG_MEDIA_ATTACH=y
++CONFIG_VIDEO_VIVI=m
++CONFIG_USB_VIDEO_CLASS=m
++CONFIG_USB_M5602=m
++CONFIG_USB_STV06XX=m
++CONFIG_USB_GL860=m
++CONFIG_USB_GSPCA_BENQ=m
++CONFIG_USB_GSPCA_CONEX=m
++CONFIG_USB_GSPCA_CPIA1=m
++CONFIG_USB_GSPCA_ETOMS=m
++CONFIG_USB_GSPCA_FINEPIX=m
++CONFIG_USB_GSPCA_JEILINJ=m
++CONFIG_USB_GSPCA_JL2005BCD=m
++CONFIG_USB_GSPCA_KINECT=m
++CONFIG_USB_GSPCA_KONICA=m
++CONFIG_USB_GSPCA_MARS=m
++CONFIG_USB_GSPCA_MR97310A=m
++CONFIG_USB_GSPCA_NW80X=m
++CONFIG_USB_GSPCA_OV519=m
++CONFIG_USB_GSPCA_OV534=m
++CONFIG_USB_GSPCA_OV534_9=m
++CONFIG_USB_GSPCA_PAC207=m
++CONFIG_USB_GSPCA_PAC7302=m
++CONFIG_USB_GSPCA_PAC7311=m
++CONFIG_USB_GSPCA_SE401=m
++CONFIG_USB_GSPCA_SN9C2028=m
++CONFIG_USB_GSPCA_SN9C20X=m
++CONFIG_USB_GSPCA_SONIXB=m
++CONFIG_USB_GSPCA_SONIXJ=m
++CONFIG_USB_GSPCA_SPCA500=m
++CONFIG_USB_GSPCA_SPCA501=m
++CONFIG_USB_GSPCA_SPCA505=m
++CONFIG_USB_GSPCA_SPCA506=m
++CONFIG_USB_GSPCA_SPCA508=m
++CONFIG_USB_GSPCA_SPCA561=m
++CONFIG_USB_GSPCA_SPCA1528=m
++CONFIG_USB_GSPCA_SQ905=m
++CONFIG_USB_GSPCA_SQ905C=m
++CONFIG_USB_GSPCA_SQ930X=m
++CONFIG_USB_GSPCA_STK014=m
++CONFIG_USB_GSPCA_STV0680=m
++CONFIG_USB_GSPCA_SUNPLUS=m
++CONFIG_USB_GSPCA_T613=m
++CONFIG_USB_GSPCA_TOPRO=m
++CONFIG_USB_GSPCA_TV8532=m
++CONFIG_USB_GSPCA_VC032X=m
++CONFIG_USB_GSPCA_VICAM=m
++CONFIG_USB_GSPCA_XIRLINK_CIT=m
++CONFIG_USB_GSPCA_ZC3XX=m
++CONFIG_USB_PWC=m
++CONFIG_VIDEO_CPIA2=m
++CONFIG_USB_ZR364XX=m
++CONFIG_USB_STKWEBCAM=m
++CONFIG_USB_S2255=m
++CONFIG_USB_SN9C102=m
++CONFIG_VIDEO_EM28XX=m
++CONFIG_VIDEO_EM28XX_ALSA=m
++CONFIG_VIDEO_EM28XX_DVB=m
++CONFIG_VIDEO_AU0828=m
++CONFIG_VIDEO_PVRUSB2=m
++CONFIG_VIDEO_HDPVR=m
++CONFIG_VIDEO_TLG2300=m
++CONFIG_VIDEO_CX231XX=m
++CONFIG_VIDEO_CX231XX_ALSA=m
++CONFIG_VIDEO_CX231XX_DVB=m
++CONFIG_VIDEO_TM6000=m
++CONFIG_VIDEO_TM6000_ALSA=m
++CONFIG_VIDEO_TM6000_DVB=m
++CONFIG_VIDEO_USBVISION=m
++CONFIG_USB_MR800=m
++CONFIG_USB_DSBR=m
++CONFIG_RADIO_SHARK=m
++CONFIG_RADIO_SHARK2=m
++CONFIG_USB_KEENE=m
++CONFIG_DVB_USB=m
++CONFIG_DVB_USB_A800=m
++CONFIG_DVB_USB_DIBUSB_MB=m
++CONFIG_DVB_USB_DIBUSB_MC=m
++CONFIG_DVB_USB_DIB0700=m
++CONFIG_DVB_USB_UMT_010=m
++CONFIG_DVB_USB_CXUSB=m
++CONFIG_DVB_USB_M920X=m
++CONFIG_DVB_USB_GL861=m
++CONFIG_DVB_USB_AU6610=m
++CONFIG_DVB_USB_DIGITV=m
++CONFIG_DVB_USB_VP7045=m
++CONFIG_DVB_USB_VP702X=m
++CONFIG_DVB_USB_GP8PSK=m
++CONFIG_DVB_USB_NOVA_T_USB2=m
++CONFIG_DVB_USB_TTUSB2=m
++CONFIG_DVB_USB_DTT200U=m
++CONFIG_DVB_USB_OPERA1=m
++CONFIG_DVB_USB_AF9005=m
++CONFIG_DVB_USB_AF9005_REMOTE=m
++CONFIG_DVB_USB_PCTV452E=m
++CONFIG_DVB_USB_DW2102=m
++CONFIG_DVB_USB_CINERGY_T2=m
++CONFIG_DVB_USB_ANYSEE=m
++CONFIG_DVB_USB_DTV5100=m
++CONFIG_DVB_USB_AF9015=m
++CONFIG_DVB_USB_CE6230=m
++CONFIG_DVB_USB_FRIIO=m
++CONFIG_DVB_USB_EC168=m
++CONFIG_DVB_USB_AZ6007=m
++CONFIG_DVB_USB_AZ6027=m
++CONFIG_DVB_USB_LME2510=m
++CONFIG_DVB_USB_TECHNISAT_USB2=m
++CONFIG_DVB_USB_IT913X=m
++CONFIG_DVB_USB_MXL111SF=m
++CONFIG_DVB_USB_RTL28XXU=m
++CONFIG_DVB_USB_AF9035=m
++# CONFIG_DVB_STB0899 is not set
++# CONFIG_DVB_STB6100 is not set
++# CONFIG_DVB_STV090x is not set
++# CONFIG_DVB_STV6110x is not set
++# CONFIG_DVB_DRXK is not set
++# CONFIG_DVB_TDA18271C2DD is not set
++# CONFIG_DVB_CX24110 is not set
++# CONFIG_DVB_CX24123 is not set
++# CONFIG_DVB_MT312 is not set
++# CONFIG_DVB_ZL10036 is not set
++# CONFIG_DVB_ZL10039 is not set
++# CONFIG_DVB_S5H1420 is not set
++# CONFIG_DVB_STV0288 is not set
++# CONFIG_DVB_STB6000 is not set
++# CONFIG_DVB_STV0299 is not set
++# CONFIG_DVB_STV6110 is not set
++# CONFIG_DVB_STV0900 is not set
++# CONFIG_DVB_TDA8083 is not set
++# CONFIG_DVB_TDA10086 is not set
++# CONFIG_DVB_TDA8261 is not set
++# CONFIG_DVB_VES1X93 is not set
++# CONFIG_DVB_TUNER_ITD1000 is not set
++# CONFIG_DVB_TUNER_CX24113 is not set
++# CONFIG_DVB_TDA826X is not set
++# CONFIG_DVB_TUA6100 is not set
++# CONFIG_DVB_CX24116 is not set
++# CONFIG_DVB_SI21XX is not set
++# CONFIG_DVB_DS3000 is not set
++# CONFIG_DVB_MB86A16 is not set
++# CONFIG_DVB_TDA10071 is not set
++# CONFIG_DVB_SP8870 is not set
++# CONFIG_DVB_SP887X is not set
++# CONFIG_DVB_CX22700 is not set
++# CONFIG_DVB_CX22702 is not set
++# CONFIG_DVB_S5H1432 is not set
++# CONFIG_DVB_DRXD is not set
++# CONFIG_DVB_L64781 is not set
++# CONFIG_DVB_TDA1004X is not set
++# CONFIG_DVB_NXT6000 is not set
++# CONFIG_DVB_MT352 is not set
++# CONFIG_DVB_DIB7000M is not set
++# CONFIG_DVB_DIB7000P is not set
++# CONFIG_DVB_DIB9000 is not set
++# CONFIG_DVB_TDA10048 is not set
++# CONFIG_DVB_HD29L2 is not set
++# CONFIG_DVB_STV0367 is not set
++# CONFIG_DVB_CXD2820R is not set
++# CONFIG_DVB_VES1820 is not set
++# CONFIG_DVB_TDA10021 is not set
++# CONFIG_DVB_TDA10023 is not set
++# CONFIG_DVB_STV0297 is not set
++# CONFIG_DVB_NXT200X is not set
++# CONFIG_DVB_OR51211 is not set
++# CONFIG_DVB_OR51132 is not set
++# CONFIG_DVB_BCM3510 is not set
++# CONFIG_DVB_LGDT330X is not set
++# CONFIG_DVB_LGDT3305 is not set
++# CONFIG_DVB_LG2160 is not set
++# CONFIG_DVB_S5H1409 is not set
++# CONFIG_DVB_AU8522_DTV is not set
++# CONFIG_DVB_AU8522_V4L is not set
++# CONFIG_DVB_S5H1411 is not set
++# CONFIG_DVB_S921 is not set
++# CONFIG_DVB_DIB8000 is not set
++# CONFIG_DVB_MB86A20S is not set
++# CONFIG_DVB_PLL is not set
++# CONFIG_DVB_TUNER_DIB0070 is not set
++# CONFIG_DVB_TUNER_DIB0090 is not set
++# CONFIG_DVB_LNBP21 is not set
++# CONFIG_DVB_LNBP22 is not set
++# CONFIG_DVB_ISL6405 is not set
++# CONFIG_DVB_ISL6421 is not set
++# CONFIG_DVB_ISL6423 is not set
++# CONFIG_DVB_A8293 is not set
++# CONFIG_DVB_LGS8GL5 is not set
++# CONFIG_DVB_LGS8GXX is not set
++# CONFIG_DVB_ATBM8830 is not set
++# CONFIG_DVB_TDA665x is not set
++# CONFIG_DVB_IX2505V is not set
++# CONFIG_DVB_M88RS2000 is not set
+ CONFIG_FB=y
+ CONFIG_FB_BCM2708=y
++# CONFIG_BACKLIGHT_GENERIC is not set
+ CONFIG_FRAMEBUFFER_CONSOLE=y
+ CONFIG_LOGO=y
+ # CONFIG_LOGO_LINUX_MONO is not set
+@@ -514,6 +718,7 @@ CONFIG_SND_BCM2835=m
+ CONFIG_SND_USB_AUDIO=m
+ CONFIG_SND_USB_UA101=m
+ CONFIG_SND_USB_CAIAQ=m
++CONFIG_SND_USB_CAIAQ_INPUT=y
+ CONFIG_SND_USB_6FIRE=m
+ CONFIG_SOUND_PRIME=m
+ CONFIG_HID_A4TECH=m
+@@ -601,6 +806,7 @@ CONFIG_USB_SERIAL_IPAQ=m
+ CONFIG_USB_SERIAL_IR=m
+ CONFIG_USB_SERIAL_EDGEPORT=m
+ CONFIG_USB_SERIAL_EDGEPORT_TI=m
++CONFIG_USB_SERIAL_F81232=m
+ CONFIG_USB_SERIAL_GARMIN=m
+ CONFIG_USB_SERIAL_IPW=m
+ CONFIG_USB_SERIAL_IUU=m
+@@ -609,6 +815,7 @@ CONFIG_USB_SERIAL_KEYSPAN=m
+ CONFIG_USB_SERIAL_KLSI=m
+ CONFIG_USB_SERIAL_KOBIL_SCT=m
+ CONFIG_USB_SERIAL_MCT_U232=m
++CONFIG_USB_SERIAL_METRO=m
+ CONFIG_USB_SERIAL_MOS7720=m
+ CONFIG_USB_SERIAL_MOS7840=m
+ CONFIG_USB_SERIAL_MOTOROLA=m
+@@ -632,6 +839,7 @@ CONFIG_USB_SERIAL_OPTICON=m
+ CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+ CONFIG_USB_SERIAL_ZIO=m
+ CONFIG_USB_SERIAL_SSU100=m
++CONFIG_USB_SERIAL_QT2=m
+ CONFIG_USB_SERIAL_DEBUG=m
+ CONFIG_USB_EMI62=m
+ CONFIG_USB_EMI26=m
+@@ -697,6 +905,14 @@ CONFIG_STAGING=y
+ CONFIG_W35UND=m
+ CONFIG_PRISM2_USB=m
+ CONFIG_R8712U=m
++CONFIG_STAGING_MEDIA=y
++CONFIG_LIRC_STAGING=y
++CONFIG_LIRC_IGORPLUGUSB=m
++CONFIG_LIRC_IMON=m
++CONFIG_LIRC_RPI=m
++CONFIG_LIRC_SASEM=m
++CONFIG_LIRC_SERIAL=m
++CONFIG_LIRC_TTUSBIR=m
+ # CONFIG_IOMMU_SUPPORT is not set
+ CONFIG_EXT4_FS=y
+ CONFIG_EXT4_FS_POSIX_ACL=y
diff --git a/patches/linux-3.6.10/0179-Avoid-the-high-load-and-block-task-messages-by-start.patch b/patches/linux-3.6.10/0179-Avoid-the-high-load-and-block-task-messages-by-start.patch
new file mode 100644
index 0000000..7957eaf
--- /dev/null
+++ b/patches/linux-3.6.10/0179-Avoid-the-high-load-and-block-task-messages-by-start.patch
@@ -0,0 +1,65 @@
+From: popcornmix <popcornmix@gmail.com>
+Date: Wed, 21 Nov 2012 23:41:35 +0000
+Subject: [PATCH] Avoid the high load and block task messages by starting
+ VCHIQka task later
+
+---
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c  | 29 +++++++++++-----------
+ 1 file changed, 14 insertions(+), 15 deletions(-)
+
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
+index 91edfd2..33519ea 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
+@@ -1567,7 +1567,6 @@ VCHIQ_STATUS_T
+ vchiq_arm_init_state(VCHIQ_STATE_T *state, VCHIQ_ARM_STATE_T *arm_state)
+ {
+ 	VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
+-	char threadname[10];
+ 
+ 	if (arm_state) {
+ 		rwlock_init(&arm_state->susp_res_lock);
+@@ -1594,19 +1593,6 @@ vchiq_arm_init_state(VCHIQ_STATE_T *state, VCHIQ_ARM_STATE_T *arm_state)
+ 		 * completion while things are waiting on the resume blocker */
+ 		complete_all(&arm_state->blocked_blocker);
+ 
+-		snprintf(threadname, sizeof(threadname), "VCHIQka-%d",
+-			state->id);
+-		arm_state->ka_thread = kthread_create(
+-			&vchiq_keepalive_thread_func,
+-			(void *)state,
+-			threadname);
+-		if (arm_state->ka_thread == NULL) {
+-			vchiq_log_error(vchiq_susp_log_level,
+-				"vchiq: FATAL: couldn't create thread %s",
+-				threadname);
+-			status = VCHIQ_ERROR;
+-		}
+-
+ 		arm_state->suspend_timer_timeout = SUSPEND_TIMER_TIMEOUT_MS;
+ 		arm_state->suspend_timer_running = 0;
+ 		init_timer(&arm_state->suspend_timer);
+@@ -2622,9 +2608,22 @@ void vchiq_platform_conn_state_changed(VCHIQ_STATE_T *state,
+ 	if (state->conn_state == VCHIQ_CONNSTATE_CONNECTED) {
+ 		write_lock_bh(&arm_state->susp_res_lock);
+ 		if (!arm_state->first_connect) {
++			char threadname[10];
+ 			arm_state->first_connect = 1;
+ 			write_unlock_bh(&arm_state->susp_res_lock);
+-			wake_up_process(arm_state->ka_thread);
++			snprintf(threadname, sizeof(threadname), "VCHIQka-%d",
++				state->id);
++			arm_state->ka_thread = kthread_create(
++				&vchiq_keepalive_thread_func,
++				(void *)state,
++				threadname);
++			if (arm_state->ka_thread == NULL) {
++				vchiq_log_error(vchiq_susp_log_level,
++					"vchiq: FATAL: couldn't create thread %s",
++					threadname);
++			} else {
++				wake_up_process(arm_state->ka_thread);
++			}
+ 		} else
+ 			write_unlock_bh(&arm_state->susp_res_lock);
+ 	}
diff --git a/patches/linux-3.6.10/0180-Enable-CMA-in-defconfig.patch b/patches/linux-3.6.10/0180-Enable-CMA-in-defconfig.patch
new file mode 100644
index 0000000..38ad511
--- /dev/null
+++ b/patches/linux-3.6.10/0180-Enable-CMA-in-defconfig.patch
@@ -0,0 +1,345 @@
+From: popcornmix <popcornmix@gmail.com>
+Date: Sun, 25 Nov 2012 14:52:18 +0000
+Subject: [PATCH] Enable CMA in defconfig
+
+---
+ arch/arm/configs/bcmrpi_defconfig       |   6 +-
+ arch/arm/configs/bcmrpi_quick_defconfig | 298 ++++++++++++++++++++++++++++++++
+ 2 files changed, 303 insertions(+), 1 deletion(-)
+ create mode 100644 arch/arm/configs/bcmrpi_quick_defconfig
+
+diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
+index 4db7a00..53cc6c2 100644
+--- a/arch/arm/configs/bcmrpi_defconfig
++++ b/arch/arm/configs/bcmrpi_defconfig
+@@ -47,7 +47,7 @@ CONFIG_SECCOMP=y
+ CONFIG_CC_STACKPROTECTOR=y
+ CONFIG_ZBOOT_ROM_TEXT=0x0
+ CONFIG_ZBOOT_ROM_BSS=0x0
+-CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext3 rootwait"
++CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
+ CONFIG_KEXEC=y
+ CONFIG_CPU_FREQ=y
+ CONFIG_CPU_FREQ_STAT=m
+@@ -330,6 +330,8 @@ CONFIG_NFC=m
+ CONFIG_NFC_PN533=m
+ CONFIG_DEVTMPFS=y
+ CONFIG_DEVTMPFS_MOUNT=y
++CONFIG_CMA=y
++CONFIG_CMA_DEBUG=y
+ CONFIG_BLK_DEV_LOOP=y
+ CONFIG_BLK_DEV_CRYPTOLOOP=m
+ CONFIG_BLK_DEV_DRBD=m
+@@ -459,6 +461,8 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+ CONFIG_TTY_PRINTK=y
+ # CONFIG_HW_RANDOM is not set
+ CONFIG_RAW_DRIVER=y
++CONFIG_BRCM_CHAR_DRIVERS=y
++CONFIG_BCM_VC_CMA=y
+ CONFIG_I2C=y
+ CONFIG_I2C_CHARDEV=m
+ CONFIG_I2C_BCM2708=m
+diff --git a/arch/arm/configs/bcmrpi_quick_defconfig b/arch/arm/configs/bcmrpi_quick_defconfig
+new file mode 100644
+index 0000000..10b84df
+--- /dev/null
++++ b/arch/arm/configs/bcmrpi_quick_defconfig
+@@ -0,0 +1,298 @@
++# CONFIG_ARM_PATCH_PHYS_VIRT is not set
++CONFIG_EXPERIMENTAL=y
++CONFIG_LOCALVERSION="-quick"
++# CONFIG_LOCALVERSION_AUTO is not set
++CONFIG_SYSVIPC=y
++CONFIG_POSIX_MQUEUE=y
++CONFIG_BSD_PROCESS_ACCT=y
++CONFIG_BSD_PROCESS_ACCT_V3=y
++CONFIG_FHANDLE=y
++CONFIG_TASKSTATS=y
++CONFIG_TASK_DELAY_ACCT=y
++CONFIG_TASK_XACCT=y
++CONFIG_TASK_IO_ACCOUNTING=y
++CONFIG_AUDIT=y
++CONFIG_NO_HZ=y
++CONFIG_HIGH_RES_TIMERS=y
++CONFIG_IKCONFIG=y
++CONFIG_IKCONFIG_PROC=y
++CONFIG_CGROUP_FREEZER=y
++CONFIG_CGROUP_DEVICE=y
++CONFIG_CGROUP_CPUACCT=y
++CONFIG_RESOURCE_COUNTERS=y
++CONFIG_BLK_CGROUP=y
++CONFIG_NAMESPACES=y
++CONFIG_SCHED_AUTOGROUP=y
++CONFIG_RELAY=y
++CONFIG_EMBEDDED=y
++# CONFIG_COMPAT_BRK is not set
++CONFIG_SLAB=y
++CONFIG_PROFILING=y
++CONFIG_OPROFILE=m
++CONFIG_KPROBES=y
++CONFIG_MODULES=y
++CONFIG_MODULE_UNLOAD=y
++CONFIG_MODVERSIONS=y
++CONFIG_MODULE_SRCVERSION_ALL=y
++# CONFIG_BLK_DEV_BSG is not set
++CONFIG_BLK_DEV_THROTTLING=y
++CONFIG_PARTITION_ADVANCED=y
++CONFIG_MAC_PARTITION=y
++CONFIG_EFI_PARTITION=y
++CONFIG_CFQ_GROUP_IOSCHED=y
++CONFIG_ARCH_BCM2708=y
++# CONFIG_BCM2708_GPIO is not set
++# CONFIG_BCM2708_VCMEM is not set
++CONFIG_PREEMPT=y
++CONFIG_AEABI=y
++CONFIG_UACCESS_WITH_MEMCPY=y
++CONFIG_SECCOMP=y
++CONFIG_CC_STACKPROTECTOR=y
++CONFIG_ZBOOT_ROM_TEXT=0x0
++CONFIG_ZBOOT_ROM_BSS=0x0
++CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
++CONFIG_KEXEC=y
++CONFIG_CPU_FREQ=y
++CONFIG_CPU_FREQ_STAT=m
++CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y
++CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
++CONFIG_CPU_FREQ_GOV_USERSPACE=y
++CONFIG_CPU_FREQ_GOV_ONDEMAND=y
++CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
++# CONFIG_ARM_BCM2835_CPUFREQ is not set
++CONFIG_CPU_IDLE=y
++CONFIG_VFP=y
++CONFIG_BINFMT_MISC=m
++CONFIG_NET=y
++CONFIG_PACKET=y
++CONFIG_UNIX=y
++CONFIG_XFRM_USER=y
++CONFIG_NET_KEY=m
++CONFIG_INET=y
++CONFIG_IP_MULTICAST=y
++CONFIG_IP_ADVANCED_ROUTER=y
++CONFIG_IP_MULTIPLE_TABLES=y
++CONFIG_IP_ROUTE_MULTIPATH=y
++CONFIG_IP_ROUTE_VERBOSE=y
++CONFIG_IP_PNP=y
++CONFIG_IP_PNP_DHCP=y
++CONFIG_IP_PNP_RARP=y
++CONFIG_NET_IPIP=m
++CONFIG_SYN_COOKIES=y
++CONFIG_INET_AH=m
++CONFIG_INET_ESP=m
++CONFIG_INET_IPCOMP=m
++CONFIG_INET_XFRM_MODE_TRANSPORT=m
++CONFIG_INET_XFRM_MODE_TUNNEL=m
++CONFIG_INET_XFRM_MODE_BEET=m
++CONFIG_INET_LRO=m
++CONFIG_INET_DIAG=m
++# CONFIG_IPV6 is not set
++CONFIG_L2TP=m
++CONFIG_NET_PKTGEN=m
++# CONFIG_WIRELESS is not set
++CONFIG_WIMAX=m
++CONFIG_NET_9P=m
++CONFIG_NFC=m
++CONFIG_NFC_PN533=m
++CONFIG_DEVTMPFS=y
++CONFIG_DEVTMPFS_MOUNT=y
++CONFIG_BLK_DEV_LOOP=y
++CONFIG_BLK_DEV_CRYPTOLOOP=m
++CONFIG_BLK_DEV_NBD=m
++CONFIG_BLK_DEV_RAM=y
++CONFIG_CDROM_PKTCDVD=m
++CONFIG_EEPROM_93CX6=m
++# CONFIG_BCM2708_VCHIQ is not set
++CONFIG_SCSI=y
++# CONFIG_SCSI_PROC_FS is not set
++CONFIG_BLK_DEV_SD=y
++CONFIG_CHR_DEV_ST=m
++CONFIG_CHR_DEV_OSST=m
++CONFIG_BLK_DEV_SR=m
++CONFIG_SCSI_MULTI_LUN=y
++# CONFIG_SCSI_LOWLEVEL is not set
++CONFIG_NETDEVICES=y
++CONFIG_MII=y
++CONFIG_NETCONSOLE=m
++CONFIG_TUN=m
++CONFIG_PHYLIB=m
++CONFIG_MDIO_BITBANG=m
++CONFIG_SLIP=m
++CONFIG_SLIP_COMPRESSED=y
++# CONFIG_WLAN is not set
++CONFIG_INPUT_FF_MEMLESS=m
++CONFIG_INPUT_POLLDEV=m
++# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
++CONFIG_INPUT_EVDEV=m
++# CONFIG_INPUT_KEYBOARD is not set
++# CONFIG_INPUT_MOUSE is not set
++# CONFIG_SERIO is not set
++CONFIG_VT_HW_CONSOLE_BINDING=y
++# CONFIG_LEGACY_PTYS is not set
++# CONFIG_DEVKMEM is not set
++CONFIG_SERIAL_AMBA_PL011=y
++CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
++CONFIG_TTY_PRINTK=y
++# CONFIG_HW_RANDOM is not set
++CONFIG_RAW_DRIVER=y
++# CONFIG_HWMON is not set
++CONFIG_FB=y
++CONFIG_FB_BCM2708=y
++CONFIG_BACKLIGHT_LCD_SUPPORT=y
++CONFIG_FRAMEBUFFER_CONSOLE=y
++CONFIG_LOGO=y
++# CONFIG_LOGO_LINUX_MONO is not set
++# CONFIG_LOGO_LINUX_VGA16 is not set
++CONFIG_SOUND=y
++# CONFIG_USB_HID is not set
++CONFIG_USB=y
++CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
++CONFIG_USB_DWCOTG=y
++CONFIG_USB_ACM=m
++CONFIG_USB_MDC800=m
++CONFIG_USB_MICROTEK=m
++CONFIG_MMC=y
++CONFIG_MMC_SDHCI=y
++CONFIG_MMC_SDHCI_PLTFM=y
++CONFIG_MMC_SDHCI_BCM2708=y
++CONFIG_MMC_SDHCI_BCM2708_DMA=y
++CONFIG_NEW_LEDS=y
++CONFIG_LEDS_CLASS=m
++CONFIG_LEDS_TRIGGERS=y
++CONFIG_LEDS_TRIGGER_TIMER=m
++CONFIG_LEDS_TRIGGER_HEARTBEAT=m
++CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
++CONFIG_UIO=m
++CONFIG_UIO_PDRV=m
++CONFIG_UIO_PDRV_GENIRQ=m
++# CONFIG_IOMMU_SUPPORT is not set
++CONFIG_EXT4_FS=y
++CONFIG_EXT4_FS_POSIX_ACL=y
++CONFIG_EXT4_FS_SECURITY=y
++CONFIG_REISERFS_FS=m
++CONFIG_REISERFS_FS_XATTR=y
++CONFIG_REISERFS_FS_POSIX_ACL=y
++CONFIG_REISERFS_FS_SECURITY=y
++CONFIG_JFS_FS=m
++CONFIG_JFS_POSIX_ACL=y
++CONFIG_JFS_SECURITY=y
++CONFIG_XFS_FS=m
++CONFIG_XFS_QUOTA=y
++CONFIG_XFS_POSIX_ACL=y
++CONFIG_XFS_RT=y
++CONFIG_GFS2_FS=m
++CONFIG_OCFS2_FS=m
++CONFIG_BTRFS_FS=m
++CONFIG_BTRFS_FS_POSIX_ACL=y
++CONFIG_NILFS2_FS=m
++CONFIG_AUTOFS4_FS=y
++CONFIG_FUSE_FS=m
++CONFIG_CUSE=m
++CONFIG_FSCACHE=y
++CONFIG_CACHEFILES=y
++CONFIG_ISO9660_FS=m
++CONFIG_JOLIET=y
++CONFIG_ZISOFS=y
++CONFIG_UDF_FS=m
++CONFIG_MSDOS_FS=y
++CONFIG_VFAT_FS=y
++CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
++CONFIG_NTFS_FS=m
++CONFIG_TMPFS=y
++CONFIG_TMPFS_POSIX_ACL=y
++CONFIG_CONFIGFS_FS=y
++CONFIG_SQUASHFS=m
++CONFIG_SQUASHFS_XATTR=y
++CONFIG_SQUASHFS_LZO=y
++CONFIG_SQUASHFS_XZ=y
++CONFIG_NFS_FS=y
++CONFIG_NFS_V3_ACL=y
++CONFIG_NFS_V4=y
++CONFIG_ROOT_NFS=y
++CONFIG_NFS_FSCACHE=y
++CONFIG_NFSD=m
++CONFIG_NFSD_V3_ACL=y
++CONFIG_NFSD_V4=y
++CONFIG_CIFS=m
++CONFIG_CIFS_WEAK_PW_HASH=y
++CONFIG_CIFS_XATTR=y
++CONFIG_CIFS_POSIX=y
++CONFIG_9P_FS=m
++CONFIG_9P_FS_POSIX_ACL=y
++CONFIG_NLS_DEFAULT="utf8"
++CONFIG_NLS_CODEPAGE_437=y
++CONFIG_NLS_CODEPAGE_737=m
++CONFIG_NLS_CODEPAGE_775=m
++CONFIG_NLS_CODEPAGE_850=m
++CONFIG_NLS_CODEPAGE_852=m
++CONFIG_NLS_CODEPAGE_855=m
++CONFIG_NLS_CODEPAGE_857=m
++CONFIG_NLS_CODEPAGE_860=m
++CONFIG_NLS_CODEPAGE_861=m
++CONFIG_NLS_CODEPAGE_862=m
++CONFIG_NLS_CODEPAGE_863=m
++CONFIG_NLS_CODEPAGE_864=m
++CONFIG_NLS_CODEPAGE_865=m
++CONFIG_NLS_CODEPAGE_866=m
++CONFIG_NLS_CODEPAGE_869=m
++CONFIG_NLS_CODEPAGE_936=m
++CONFIG_NLS_CODEPAGE_950=m
++CONFIG_NLS_CODEPAGE_932=m
++CONFIG_NLS_CODEPAGE_949=m
++CONFIG_NLS_CODEPAGE_874=m
++CONFIG_NLS_ISO8859_8=m
++CONFIG_NLS_CODEPAGE_1250=m
++CONFIG_NLS_CODEPAGE_1251=m
++CONFIG_NLS_ASCII=y
++CONFIG_NLS_ISO8859_1=m
++CONFIG_NLS_ISO8859_2=m
++CONFIG_NLS_ISO8859_3=m
++CONFIG_NLS_ISO8859_4=m
++CONFIG_NLS_ISO8859_5=m
++CONFIG_NLS_ISO8859_6=m
++CONFIG_NLS_ISO8859_7=m
++CONFIG_NLS_ISO8859_9=m
++CONFIG_NLS_ISO8859_13=m
++CONFIG_NLS_ISO8859_14=m
++CONFIG_NLS_ISO8859_15=m
++CONFIG_NLS_KOI8_R=m
++CONFIG_NLS_KOI8_U=m
++CONFIG_PRINTK_TIME=y
++CONFIG_DEBUG_FS=y
++CONFIG_DETECT_HUNG_TASK=y
++CONFIG_TIMER_STATS=y
++# CONFIG_DEBUG_PREEMPT is not set
++CONFIG_DEBUG_MEMORY_INIT=y
++CONFIG_BOOT_PRINTK_DELAY=y
++CONFIG_LATENCYTOP=y
++# CONFIG_KPROBE_EVENT is not set
++CONFIG_KGDB=y
++CONFIG_KGDB_KDB=y
++CONFIG_KDB_KEYBOARD=y
++CONFIG_STRICT_DEVMEM=y
++CONFIG_DEBUG_LL=y
++CONFIG_DEBUG_BCM2708_UART0=y
++CONFIG_EARLY_PRINTK=y
++CONFIG_CRYPTO_SEQIV=m
++CONFIG_CRYPTO_CBC=y
++CONFIG_CRYPTO_XTS=m
++CONFIG_CRYPTO_HMAC=y
++CONFIG_CRYPTO_XCBC=m
++CONFIG_CRYPTO_MD5=y
++CONFIG_CRYPTO_MICHAEL_MIC=m
++CONFIG_CRYPTO_SHA1=y
++CONFIG_CRYPTO_SHA256=m
++CONFIG_CRYPTO_SHA512=m
++CONFIG_CRYPTO_TGR192=m
++CONFIG_CRYPTO_WP512=m
++CONFIG_CRYPTO_AES=m
++CONFIG_CRYPTO_CAST5=m
++CONFIG_CRYPTO_DES=y
++# CONFIG_CRYPTO_ANSI_CPRNG is not set
++# CONFIG_CRYPTO_HW is not set
++CONFIG_CRC_CCITT=m
++CONFIG_CRC_ITU_T=y
++CONFIG_CRC7=m
++CONFIG_LIBCRC32C=y
++CONFIG_AVERAGE=y
diff --git a/patches/linux-3.6.10/0181-Avoid-undefined-symbol-in-radio-shark.ko.patch b/patches/linux-3.6.10/0181-Avoid-undefined-symbol-in-radio-shark.ko.patch
new file mode 100644
index 0000000..fbd3aa5
--- /dev/null
+++ b/patches/linux-3.6.10/0181-Avoid-undefined-symbol-in-radio-shark.ko.patch
@@ -0,0 +1,23 @@
+From: popcornmix <popcornmix@gmail.com>
+Date: Sun, 25 Nov 2012 14:53:14 +0000
+Subject: [PATCH] Avoid undefined symbol in radio-shark.ko
+
+---
+ sound/pci/Kconfig | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
+index ff3af6e..f99fa25 100644
+--- a/sound/pci/Kconfig
++++ b/sound/pci/Kconfig
+@@ -2,8 +2,8 @@
+ 
+ config SND_TEA575X
+ 	tristate
+-	depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO
+-	default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO
++	depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK
++	default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK
+ 
+ menuconfig SND_PCI
+ 	bool "PCI sound devices"
diff --git a/patches/linux-3.6.10/0182-Allow-mailbox-driver-to-be-called-from-user-code-tho.patch b/patches/linux-3.6.10/0182-Allow-mailbox-driver-to-be-called-from-user-code-tho.patch
new file mode 100644
index 0000000..701203e
--- /dev/null
+++ b/patches/linux-3.6.10/0182-Allow-mailbox-driver-to-be-called-from-user-code-tho.patch
@@ -0,0 +1,234 @@
+From: popcornmix <popcornmix@gmail.com>
+Date: Sun, 25 Nov 2012 18:28:09 +0000
+Subject: [PATCH] Allow mailbox driver to be called from user code though ioctl
+
+---
+ arch/arm/mach-bcm2708/include/mach/vcio.h |  33 +++++++
+ arch/arm/mach-bcm2708/vcio.c              | 137 +++++++++++++++++++++++++++++-
+ 2 files changed, 168 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-bcm2708/include/mach/vcio.h b/arch/arm/mach-bcm2708/include/mach/vcio.h
+index 7dfd14e..b522ba9 100644
+--- a/arch/arm/mach-bcm2708/include/mach/vcio.h
++++ b/arch/arm/mach-bcm2708/include/mach/vcio.h
+@@ -105,4 +105,37 @@ extern int /*rc*/ bcm_mailbox_read(unsigned chan, uint32_t *data28);
+ extern int /*rc*/ bcm_mailbox_write(unsigned chan, uint32_t data28);
+ extern int /*rc*/ bcm_mailbox_property(void *data, int size);
+ 
++#include <linux/ioctl.h>
++
++/* 
++ * The major device number. We can't rely on dynamic 
++ * registration any more, because ioctls need to know 
++ * it. 
++ */
++#define MAJOR_NUM 100
++
++/* 
++ * Set the message of the device driver 
++ */
++#define IOCTL_MBOX_PROPERTY _IOWR(MAJOR_NUM, 0, char *)
++/*
++ * _IOWR means that we're creating an ioctl command 
++ * number for passing information from a user process
++ * to the kernel module and from the kernel module to user process 
++ *
++ * The first arguments, MAJOR_NUM, is the major device 
++ * number we're using.
++ *
++ * The second argument is the number of the command 
++ * (there could be several with different meanings).
++ *
++ * The third argument is the type we want to get from 
++ * the process to the kernel.
++ */
++
++/* 
++ * The name of the device file 
++ */
++#define DEVICE_FILE_NAME "char_dev"
++
+ #endif
+diff --git a/arch/arm/mach-bcm2708/vcio.c b/arch/arm/mach-bcm2708/vcio.c
+index 468fdef..09b78b5 100644
+--- a/arch/arm/mach-bcm2708/vcio.c
++++ b/arch/arm/mach-bcm2708/vcio.c
+@@ -37,6 +37,9 @@
+ #include <mach/vcio.h>
+ #include <mach/platform.h>
+ 
++#include <asm/uaccess.h>
++
++
+ #define DRIVER_NAME BCM_VCIO_DRIVER_NAME
+ 
+ /* ----------------------------------------------------------------------
+@@ -216,6 +219,33 @@ static void dev_mbox_register(const char *dev_name, struct device *dev)
+ 	mbox_dev = dev;
+ }
+ 
++static int mbox_copy_from_user(void *dst, const void *src, int size)
++{
++	if ( (uint32_t)src < TASK_SIZE)
++	{
++		return copy_from_user(dst, src, size);
++	}
++	else
++	{
++		memcpy( dst, src, size );
++		return 0;
++	}
++}
++
++static int mbox_copy_to_user(void *dst, const void *src, int size)
++{
++	if ( (uint32_t)dst < TASK_SIZE)
++	{
++		return copy_to_user(dst, src, size);
++	}
++	else
++	{
++		memcpy( dst, src, size );
++		return 0;
++	}
++}
++
++
+ extern int bcm_mailbox_property(void *data, int size)
+ {
+ 	uint32_t success;
+@@ -227,7 +257,7 @@ extern int bcm_mailbox_property(void *data, int size)
+ 	mem_kern = dma_alloc_coherent(NULL, PAGE_ALIGN(size), &mem_bus, GFP_ATOMIC);
+ 	if (mem_kern) {
+ 		/* create the message */
+-		memcpy(mem_kern, data, size);
++		mbox_copy_from_user(mem_kern, data, size);
+ 
+ 		/* send the message */
+ 		wmb();
+@@ -238,7 +268,7 @@ extern int bcm_mailbox_property(void *data, int size)
+ 		if (s == 0) {
+ 			/* copy the response */
+ 			rmb();
+-			memcpy(data, mem_kern, size);
++			mbox_copy_to_user(data, mem_kern, size);
+ 		}
+ 		dma_free_coherent(NULL, PAGE_ALIGN(size), mem_kern, mem_bus);
+ 	} else {
+@@ -254,6 +284,93 @@ EXPORT_SYMBOL_GPL(bcm_mailbox_property);
+  *	Platform Device for Mailbox
+  * -------------------------------------------------------------------- */
+ 
++/* 
++ * Is the device open right now? Used to prevent
++ * concurent access into the same device 
++ */
++static int Device_Open = 0;
++
++/* 
++ * This is called whenever a process attempts to open the device file 
++ */
++static int device_open(struct inode *inode, struct file *file)
++{
++	/* 
++	 * We don't want to talk to two processes at the same time 
++	 */
++	if (Device_Open)
++		return -EBUSY;
++
++	Device_Open++;
++	/*
++	 * Initialize the message 
++	 */
++	try_module_get(THIS_MODULE);
++	return 0;
++}
++
++static int device_release(struct inode *inode, struct file *file)
++{
++	/* 
++	 * We're now ready for our next caller 
++	 */
++	Device_Open--;
++
++	module_put(THIS_MODULE);
++	return 0;
++}
++
++/* 
++ * This function is called whenever a process tries to do an ioctl on our
++ * device file. We get two extra parameters (additional to the inode and file
++ * structures, which all device functions get): the number of the ioctl called
++ * and the parameter given to the ioctl function.
++ *
++ * If the ioctl is write or read/write (meaning output is returned to the
++ * calling process), the ioctl call returns the output of this function.
++ *
++ */
++static long device_ioctl(struct file *file,	/* see include/linux/fs.h */
++		 unsigned int ioctl_num,	/* number and param for ioctl */
++		 unsigned long ioctl_param)
++{
++	unsigned size;
++	/* 
++	 * Switch according to the ioctl called 
++	 */
++	switch (ioctl_num) {
++	case IOCTL_MBOX_PROPERTY:
++		/* 
++		 * Receive a pointer to a message (in user space) and set that
++		 * to be the device's message.  Get the parameter given to 
++		 * ioctl by the process. 
++		 */
++		mbox_copy_from_user(&size, (void *)ioctl_param, sizeof size);
++		return bcm_mailbox_property((void *)ioctl_param, size);
++		break;
++	default:
++		printk(KERN_ERR DRIVER_NAME "unknown ioctl: %d\n", ioctl_num);
++		return -EINVAL;
++	}
++
++	return 0;
++}
++
++/* Module Declarations */
++
++/* 
++ * This structure will hold the functions to be called
++ * when a process does something to the device we
++ * created. Since a pointer to this structure is kept in
++ * the devices table, it can't be local to
++ * init_module. NULL is for unimplemented functios. 
++ */
++struct file_operations fops = {
++	.unlocked_ioctl = device_ioctl,
++	.open = device_open,
++	.release = device_release,	/* a.k.a. close */
++};
++
+ static int bcm_vcio_probe(struct platform_device *pdev)
+ {
+ 	int ret = 0;
+@@ -286,6 +403,22 @@ static int bcm_vcio_probe(struct platform_device *pdev)
+ 			       __io_address(ARM_0_MAIL0_RD));
+ 		}
+ 	}
++
++	if (ret == 0) {
++		/* 
++		 * Register the character device
++		 */
++		ret = register_chrdev(MAJOR_NUM, DEVICE_FILE_NAME, &fops);
++
++		/* 
++		 * Negative values signify an error 
++		 */
++		if (ret < 0) {
++			printk(KERN_ERR DRIVER_NAME
++			       "Failed registering the character device %d\n", ret);
++			return ret;
++		}
++	}
+ 	return ret;
+ }
+ 
diff --git a/patches/linux-3.6.10/0183-usbnet-ratelimit-kevent-may-have-been-dropped-warnin.patch b/patches/linux-3.6.10/0183-usbnet-ratelimit-kevent-may-have-been-dropped-warnin.patch
new file mode 100644
index 0000000..0d4e622
--- /dev/null
+++ b/patches/linux-3.6.10/0183-usbnet-ratelimit-kevent-may-have-been-dropped-warnin.patch
@@ -0,0 +1,40 @@
+From: Steve Glendinning <steve.glendinning@shawell.net>
+Date: Thu, 8 Nov 2012 06:26:21 +0000
+Subject: [PATCH] usbnet: ratelimit kevent may have been dropped warnings
+
+when something goes wrong, a flood of these messages can be
+generated by usbnet (thousands per second).  This doesn't
+generally *help* the condition so this patch ratelimits the
+rate of their generation.
+
+There's an underlying problem in usbnet's kevent deferral
+mechanism which needs fixing, specifically that events *can*
+get dropped and not handled.  This patch doesn't address this,
+but just mitigates fallout caused by the current implemention.
+
+Signed-off-by: Steve Glendinning <steve.glendinning@shawell.net>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/usb/usbnet.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
+index 9c382b5..a8026c6 100644
+--- a/drivers/net/usb/usbnet.c
++++ b/drivers/net/usb/usbnet.c
+@@ -359,10 +359,12 @@ static enum skb_state defer_bh(struct usbnet *dev, struct sk_buff *skb,
+ void usbnet_defer_kevent (struct usbnet *dev, int work)
+ {
+ 	set_bit (work, &dev->flags);
+-	if (!schedule_work (&dev->kevent))
+-		netdev_err(dev->net, "kevent %d may have been dropped\n", work);
+-	else
++	if (!schedule_work (&dev->kevent)) {
++		if (net_ratelimit())
++			netdev_err(dev->net, "kevent %d may have been dropped\n", work);
++	} else {
+ 		netdev_dbg(dev->net, "kevent %d scheduled\n", work);
++	}
+ }
+ EXPORT_SYMBOL_GPL(usbnet_defer_kevent);
+ 
diff --git a/patches/linux-3.6.10/0184-Lazy-CRC-quirk-Implemented-retrying-mechanisms-for-S.patch b/patches/linux-3.6.10/0184-Lazy-CRC-quirk-Implemented-retrying-mechanisms-for-S.patch
new file mode 100644
index 0000000..ff3b024
--- /dev/null
+++ b/patches/linux-3.6.10/0184-Lazy-CRC-quirk-Implemented-retrying-mechanisms-for-S.patch
@@ -0,0 +1,232 @@
+From: dero <de@ro>
+Date: Mon, 19 Nov 2012 12:46:06 +0100
+Subject: [PATCH] Lazy CRC quirk: Implemented retrying mechanisms for SD SSR
+ and SCR, disabled missing_status and spurious CRC ACMD51 quirks by default
+ (should be fixed by the retrying-mechanishm)
+
+---
+ drivers/mmc/core/sd.c            | 115 +++++++++++++++++++++++++++++++++------
+ drivers/mmc/host/sdhci-bcm2708.c |  13 ++++-
+ 2 files changed, 109 insertions(+), 19 deletions(-)
+
+diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
+index 74972c2..3302478 100644
+--- a/drivers/mmc/core/sd.c
++++ b/drivers/mmc/core/sd.c
+@@ -13,6 +13,8 @@
+ #include <linux/err.h>
+ #include <linux/slab.h>
+ #include <linux/stat.h>
++#include <linux/jiffies.h>
++#include <linux/nmi.h>
+ 
+ #include <linux/mmc/host.h>
+ #include <linux/mmc/card.h>
+@@ -58,6 +60,15 @@ static const unsigned int tacc_mant[] = {
+ 		__res & __mask;						\
+ 	})
+ 
++// timeout for tries
++static const unsigned long retry_timeout_ms= 10*1000;
++
++// try at least 10 times, even if timeout is reached
++static const int retry_min_tries= 10;
++
++// delay between tries
++static const unsigned long retry_delay_ms= 10;
++
+ /*
+  * Given the decoded CSD structure, decode the raw CID to our CID structure.
+  */
+@@ -210,12 +221,62 @@ static int mmc_decode_scr(struct mmc_card *card)
+ }
+ 
+ /*
+- * Fetch and process SD Status register.
++ * Fetch and process SD Configuration Register.
++ */
++static int mmc_read_scr(struct mmc_card *card)
++{
++	unsigned long timeout_at;
++	int err, tries;
++
++	timeout_at= jiffies + msecs_to_jiffies( retry_timeout_ms );
++	tries= 		0;
++
++	while( tries < retry_min_tries || time_before( jiffies, timeout_at ) )
++	{
++		unsigned long delay_at;
++		tries++;
++
++		err = mmc_app_send_scr(card, card->raw_scr);
++		if( !err )
++			break; // sucess!!!
++
++		touch_nmi_watchdog();	  // we are still alive!
++
++		// delay
++		delay_at= jiffies + msecs_to_jiffies( retry_delay_ms );
++		while( time_before( jiffies, delay_at ) )
++		{
++			mdelay( 1 );
++			touch_nmi_watchdog();	  // we are still alive!
++		}
++	}
++	
++	if( err)
++	{
++		pr_err("%s: failed to read SD Configuration register (SCR) after %d tries during %lu ms, error %d\n", mmc_hostname(card->host), tries, retry_timeout_ms, err );
++		return err;
++	}
++
++	if( tries > 1 )
++	{
++		pr_info("%s: could read SD Configuration register (SCR) at the %dth attempt\n", mmc_hostname(card->host), tries );
++	}
++
++	err = mmc_decode_scr(card);
++	if (err)
++		return err;
++	
++	return err;
++}
++
++/*
++ * Fetch and process SD Status Register.
+  */
+ static int mmc_read_ssr(struct mmc_card *card)
+ {
++	unsigned long timeout_at;
+ 	unsigned int au, es, et, eo;
+-	int err, i;
++	int err, i, tries;
+ 	u32 *ssr;
+ 
+ 	if (!(card->csd.cmdclass & CCC_APP_SPEC)) {
+@@ -227,15 +288,41 @@ static int mmc_read_ssr(struct mmc_card *card)
+ 	ssr = kmalloc(64, GFP_KERNEL);
+ 	if (!ssr)
+ 		return -ENOMEM;
+-
+-	err = mmc_app_sd_status(card, ssr);
+-	if (err) {
+-		pr_warning("%s: problem reading SD Status "
+-			"register.\n", mmc_hostname(card->host));
+-		err = 0;
++	
++	timeout_at= jiffies + msecs_to_jiffies( retry_timeout_ms );
++	tries= 		0;
++	
++	while( tries < retry_min_tries || time_before( jiffies, timeout_at ) )
++	{
++		unsigned long delay_at;
++		tries++;
++		
++		err= mmc_app_sd_status(card, ssr);
++		if( !err )
++			break; // sucess!!!
++	
++		touch_nmi_watchdog();	  // we are still alive!
++	
++		// delay
++		delay_at= jiffies + msecs_to_jiffies( retry_delay_ms );
++		while( time_before( jiffies, delay_at ) )
++		{
++			mdelay( 1 );
++			touch_nmi_watchdog();	  // we are still alive!
++		}			
++	}
++	
++	if( err) 
++	{
++		pr_err("%s: failed to read SD Status register (SSR) after %d tries during %lu ms, error %d\n", mmc_hostname(card->host), tries, retry_timeout_ms, err );
+ 		goto out;
+ 	}
+ 
++	if( tries > 1 )
++	{
++		pr_info("%s: could read SD Status register (SSR) at the %dth attempt\n", mmc_hostname(card->host), tries );
++	}
++
+ 	for (i = 0; i < 16; i++)
+ 		ssr[i] = be32_to_cpu(ssr[i]);
+ 
+@@ -799,15 +886,11 @@ int mmc_sd_setup_card(struct mmc_host *host, struct mmc_card *card,
+ 
+ 	if (!reinit) {
+ 		/*
+-		 * Fetch SCR from card.
++		 * Fetch and decode SD Configuration register.
+ 		 */
+-		err = mmc_app_send_scr(card, card->raw_scr);
+-		if (err)
+-			return err;
+-
+-		err = mmc_decode_scr(card);
+-		if (err)
+-			return err;
++	  	err = mmc_read_scr(card);
++	  	if( err )
++	  		return err;
+ 
+ 		/*
+ 		 * Fetch and process SD Status register.
+diff --git a/drivers/mmc/host/sdhci-bcm2708.c b/drivers/mmc/host/sdhci-bcm2708.c
+index c6f943e..5b6ae2f 100644
+--- a/drivers/mmc/host/sdhci-bcm2708.c
++++ b/drivers/mmc/host/sdhci-bcm2708.c
+@@ -136,7 +136,8 @@ static inline unsigned long int since_ns(hptime_t t)
+ static bool allow_highspeed = 1;
+ static int emmc_clock_freq = BCM2708_EMMC_CLOCK_FREQ;
+ static bool sync_after_dma = 1;
+-static bool missing_status = 1;
++static bool missing_status = 0;
++static bool spurious_crc_acmd51 = 0;
+ bool enable_llm = 1;
+ 
+ #if 0
+@@ -1103,7 +1104,7 @@ static unsigned int sdhci_bcm2708_quirk_extra_ints(struct sdhci_host *host)
+         return 1;
+ }
+ 
+-static unsigned int sdhci_bcm2708_quirk_spurious_crc(struct sdhci_host *host)
++static unsigned int sdhci_bcm2708_quirk_spurious_crc_acmd51(struct sdhci_host *host)
+ {
+         return 1;
+ }
+@@ -1149,7 +1150,6 @@ static struct sdhci_ops sdhci_bcm2708_ops = {
+ 	.pdma_reset = sdhci_bcm2708_platdma_reset,
+ #endif
+ 	.extra_ints = sdhci_bcm2708_quirk_extra_ints,
+-	.spurious_crc_acmd51 = sdhci_bcm2708_quirk_spurious_crc,
+ 	.voltage_broken = sdhci_bcm2708_quirk_voltage_broken,
+ 	.uhs_broken = sdhci_bcm2708_uhs_broken,
+ };
+@@ -1194,6 +1194,11 @@ static int __devinit sdhci_bcm2708_probe(struct platform_device *pdev)
+ 		sdhci_bcm2708_ops.missing_status = sdhci_bcm2708_missing_status;
+ 	}
+ 
++	if( spurious_crc_acmd51 ) {
++		sdhci_bcm2708_ops.spurious_crc_acmd51 = sdhci_bcm2708_quirk_spurious_crc_acmd51;
++	}
++
++
+ 	printk("sdhci: %s low-latency mode\n",enable_llm?"Enable":"Disable");
+ 
+ 	host->hw_name = "BCM2708_Arasan";
+@@ -1389,6 +1394,7 @@ module_param(allow_highspeed, bool, 0444);
+ module_param(emmc_clock_freq, int, 0444);
+ module_param(sync_after_dma, bool, 0444);
+ module_param(missing_status, bool, 0444);
++module_param(spurious_crc_acmd51, bool, 0444);
+ module_param(enable_llm, bool, 0444);
+ module_param(cycle_delay, int, 0444);
+ 
+@@ -1401,6 +1407,7 @@ MODULE_PARM_DESC(allow_highspeed, "Allow high speed transfers modes");
+ MODULE_PARM_DESC(emmc_clock_freq, "Specify the speed of emmc clock");
+ MODULE_PARM_DESC(sync_after_dma, "Block in driver until dma complete");
+ MODULE_PARM_DESC(missing_status, "Use the missing status quirk");
++MODULE_PARM_DESC(spurious_crc_acmd51, "Use the spurious crc quirk for reading SCR (ACMD51)");
+ MODULE_PARM_DESC(enable_llm, "Enable low-latency mode");
+ 
+ 
diff --git a/patches/linux-3.6.10/0185-Leave-missing_status-enabled-for-now.patch b/patches/linux-3.6.10/0185-Leave-missing_status-enabled-for-now.patch
new file mode 100644
index 0000000..edd28da
--- /dev/null
+++ b/patches/linux-3.6.10/0185-Leave-missing_status-enabled-for-now.patch
@@ -0,0 +1,21 @@
+From: popcornmix <popcornmix@gmail.com>
+Date: Mon, 26 Nov 2012 21:40:34 +0000
+Subject: [PATCH] Leave missing_status enabled for now.
+
+---
+ drivers/mmc/host/sdhci-bcm2708.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/mmc/host/sdhci-bcm2708.c b/drivers/mmc/host/sdhci-bcm2708.c
+index 5b6ae2f..c3c71a4 100644
+--- a/drivers/mmc/host/sdhci-bcm2708.c
++++ b/drivers/mmc/host/sdhci-bcm2708.c
+@@ -136,7 +136,7 @@ static inline unsigned long int since_ns(hptime_t t)
+ static bool allow_highspeed = 1;
+ static int emmc_clock_freq = BCM2708_EMMC_CLOCK_FREQ;
+ static bool sync_after_dma = 1;
+-static bool missing_status = 0;
++static bool missing_status = 1;
+ static bool spurious_crc_acmd51 = 0;
+ bool enable_llm = 1;
+ 
diff --git a/patches/linux-3.6.10/0186-Update-to-latest-cma-and-vchiq.patch b/patches/linux-3.6.10/0186-Update-to-latest-cma-and-vchiq.patch
new file mode 100644
index 0000000..d44ef04
--- /dev/null
+++ b/patches/linux-3.6.10/0186-Update-to-latest-cma-and-vchiq.patch
@@ -0,0 +1,1114 @@
+From: popcornmix <popcornmix@gmail.com>
+Date: Wed, 28 Nov 2012 16:22:07 +0000
+Subject: [PATCH] Update to latest cma and vchiq
+
+---
+ drivers/char/broadcom/vc_cma/vc_cma.c              | 624 ++++++++++++++-------
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c  |   2 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_core.c |  70 ++-
+ .../vc04_services/interface/vchiq_arm/vchiq_core.h |   1 +
+ .../interface/vchiq_arm/vchiq_genversion           |  12 +-
+ 5 files changed, 488 insertions(+), 221 deletions(-)
+
+diff --git a/drivers/char/broadcom/vc_cma/vc_cma.c b/drivers/char/broadcom/vc_cma/vc_cma.c
+index ec7aef1..9f2473e 100644
+--- a/drivers/char/broadcom/vc_cma/vc_cma.c
++++ b/drivers/char/broadcom/vc_cma/vc_cma.c
+@@ -25,12 +25,14 @@
+ #include <linux/dma-contiguous.h>
+ #include <linux/platform_device.h>
+ #include <linux/uaccess.h>
+-
++#include <asm/cacheflush.h>
+ 
+ #include "vc_cma.h"
+ 
+ #include "vchiq_util.h"
+ #include "vchiq_connected.h"
++//#include "debug_sym.h"
++//#include "vc_mem.h"
+ 
+ #define DRIVER_NAME  "vc-cma"
+ 
+@@ -43,7 +45,7 @@
+ #define VC_CMA_FOURCC VCHIQ_MAKE_FOURCC('C', 'M', 'A', ' ')
+ #define VC_CMA_VERSION 2
+ 
+-#define VC_CMA_CHUNK_ORDER 6  /* 256K */
++#define VC_CMA_CHUNK_ORDER 6	/* 256K */
+ #define VC_CMA_CHUNK_SIZE (4096 << VC_CMA_CHUNK_ORDER)
+ #define VC_CMA_MAX_PARAMS_PER_MSG \
+ 	((VCHIQ_MAX_MSG_SIZE - sizeof(unsigned short))/sizeof(unsigned short))
+@@ -51,16 +53,21 @@
+ 
+ #define PAGES_PER_CHUNK (VC_CMA_CHUNK_SIZE / PAGE_SIZE)
+ 
++#define VCADDR_TO_PHYSADDR(vcaddr) (mm_vc_mem_phys_addr + vcaddr)
++
++#define loud_error(...) \
++	LOG_ERR("===== " __VA_ARGS__)
++
+ enum {
+ 	VC_CMA_MSG_QUIT,
+ 	VC_CMA_MSG_OPEN,
+ 	VC_CMA_MSG_TICK,
+-	VC_CMA_MSG_ALLOC,     /* chunk count */
+-	VC_CMA_MSG_FREE,      /* chunk, chunk, ... */
+-	VC_CMA_MSG_ALLOCATED, /* chunk, chunk, ... */
+-	VC_CMA_MSG_REQUEST_ALLOC, /* chunk count */
+-	VC_CMA_MSG_REQUEST_FREE,  /* chunk count */
+-	VC_CMA_MSG_RESERVE,   /* bytes lo, bytes hi */
++	VC_CMA_MSG_ALLOC,	/* chunk count */
++	VC_CMA_MSG_FREE,	/* chunk, chunk, ... */
++	VC_CMA_MSG_ALLOCATED,	/* chunk, chunk, ... */
++	VC_CMA_MSG_REQUEST_ALLOC,	/* chunk count */
++	VC_CMA_MSG_REQUEST_FREE,	/* chunk count */
++	VC_CMA_MSG_RESERVE,	/* bytes lo, bytes hi */
+ 	VC_CMA_MSG_UPDATE_RESERVE,
+ 	VC_CMA_MSG_MAX
+ };
+@@ -76,38 +83,40 @@ struct vc_cma_reserve_user {
+ };
+ 
+ /* Device (/dev) related variables */
+-static dev_t         vc_cma_devnum;
++static dev_t vc_cma_devnum;
+ static struct class *vc_cma_class;
+-static struct cdev   vc_cma_cdev;
+-static int           vc_cma_inited;
+-static int           vc_cma_debug;
++static struct cdev vc_cma_cdev;
++static int vc_cma_inited;
++static int vc_cma_debug;
+ 
+ /* Proc entry */
+ static struct proc_dir_entry *vc_cma_proc_entry;
+ 
+-phys_addr_t   vc_cma_base;
+-struct page  *vc_cma_base_page;
+-unsigned int  vc_cma_size;
++phys_addr_t vc_cma_base;
++struct page *vc_cma_base_page;
++unsigned int vc_cma_size;
+ EXPORT_SYMBOL(vc_cma_size);
+-unsigned int  vc_cma_initial;
+-unsigned int  vc_cma_chunks;
+-unsigned int  vc_cma_chunks_used;
+-unsigned int  vc_cma_chunks_reserved;
++unsigned int vc_cma_initial;
++unsigned int vc_cma_chunks;
++unsigned int vc_cma_chunks_used;
++unsigned int vc_cma_chunks_reserved;
+ 
+-unsigned int  vc_cma_reserve_total;
+-unsigned int  vc_cma_reserve_count;
++static int in_loud_error;
++
++unsigned int vc_cma_reserve_total;
++unsigned int vc_cma_reserve_count;
+ struct vc_cma_reserve_user vc_cma_reserve_users[VC_CMA_RESERVE_COUNT_MAX];
+ static DEFINE_SEMAPHORE(vc_cma_reserve_mutex);
+ static DEFINE_SEMAPHORE(vc_cma_worker_queue_push_mutex);
+ 
+ static u64 vc_cma_dma_mask = DMA_BIT_MASK(32);
+ static struct platform_device vc_cma_device = {
+-	.name	= "vc-cma",
+-	.id	= 0,
+-	.dev	= {
+-		.dma_mask		= &vc_cma_dma_mask,
+-		.coherent_dma_mask	= DMA_BIT_MASK(32),
+-	},
++	.name = "vc-cma",
++	.id = 0,
++	.dev = {
++		.dma_mask = &vc_cma_dma_mask,
++		.coherent_dma_mask = DMA_BIT_MASK(32),
++		},
+ };
+ 
+ static VCHIQ_INSTANCE_T cma_instance;
+@@ -117,16 +126,13 @@ static struct task_struct *cma_worker;
+ 
+ static int vc_cma_set_reserve(unsigned int reserve, unsigned int pid);
+ static int vc_cma_alloc_chunks(int num_chunks, struct cma_msg *reply);
+-static VCHIQ_STATUS_T cma_service_callback(
+-	VCHIQ_REASON_T reason,
+-	VCHIQ_HEADER_T *header,
+-	VCHIQ_SERVICE_HANDLE_T service,
+-	void *bulk_userdata);
+-static void send_vc_msg(
+-	unsigned short type,
+-	unsigned short param1,
+-	unsigned short param2);
+-static bool send_worker_msg(VCHIQ_HEADER_T *msg);
++static VCHIQ_STATUS_T cma_service_callback(VCHIQ_REASON_T reason,
++					   VCHIQ_HEADER_T * header,
++					   VCHIQ_SERVICE_HANDLE_T service,
++					   void *bulk_userdata);
++static void send_vc_msg(unsigned short type,
++			unsigned short param1, unsigned short param2);
++static bool send_worker_msg(VCHIQ_HEADER_T * msg);
+ 
+ static int __init early_vc_cma_mem(char *p)
+ {
+@@ -140,18 +146,18 @@ static int __init early_vc_cma_mem(char *p)
+ 		vc_cma_base = memparse(p + 1, &p);
+ 
+ 	new_size = (vc_cma_size - ((-vc_cma_base) & (VC_CMA_CHUNK_SIZE - 1)))
+-		& ~(VC_CMA_CHUNK_SIZE - 1);
++	    & ~(VC_CMA_CHUNK_SIZE - 1);
+ 	if (new_size > vc_cma_size)
+ 		vc_cma_size = 0;
+ 	vc_cma_initial = (vc_cma_initial + VC_CMA_CHUNK_SIZE - 1)
+-		& ~(VC_CMA_CHUNK_SIZE - 1);
++	    & ~(VC_CMA_CHUNK_SIZE - 1);
+ 	if (vc_cma_initial > vc_cma_size)
+ 		vc_cma_initial = vc_cma_size;
+ 	vc_cma_base = (vc_cma_base + VC_CMA_CHUNK_SIZE - 1)
+-		& ~(VC_CMA_CHUNK_SIZE - 1);
++	    & ~(VC_CMA_CHUNK_SIZE - 1);
+ 
+ 	printk(KERN_ERR " -> initial %x, size %x, base %x", vc_cma_initial,
+-		vc_cma_size, (unsigned int)vc_cma_base);
++	       vc_cma_size, (unsigned int)vc_cma_base);
+ 
+ 	return 0;
+ }
+@@ -174,7 +180,7 @@ void __init vc_cma_reserve(void)
+ 	 */
+ 	if (vc_cma_size) {
+ 		if (dma_declare_contiguous(&vc_cma_device.dev, vc_cma_size,
+-			vc_cma_base, 0) == 0) {
++					   vc_cma_base, 0) == 0) {
+ 		} else {
+ 			LOG_ERR("vc_cma: dma_declare_contiguous(%x,%x) failed",
+ 				vc_cma_size, (unsigned int)vc_cma_base);
+@@ -241,7 +247,6 @@ static long vc_cma_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+ 	return rc;
+ }
+ 
+-
+ /****************************************************************************
+ *
+ *   File Operations for the driver.
+@@ -249,9 +254,9 @@ static long vc_cma_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+ ***************************************************************************/
+ 
+ static const struct file_operations vc_cma_fops = {
+-	.owner          = THIS_MODULE,
+-	.open           = vc_cma_open,
+-	.release        = vc_cma_release,
++	.owner = THIS_MODULE,
++	.open = vc_cma_open,
++	.release = vc_cma_release,
+ 	.unlocked_ioctl = vc_cma_ioctl,
+ };
+ 
+@@ -271,19 +276,19 @@ static int vc_cma_show_info(struct seq_file *m, void *v)
+ 	seq_printf(m, "   Initial    : %08x\n", vc_cma_initial);
+ 	seq_printf(m, "   Chunk size : %08x\n", VC_CMA_CHUNK_SIZE);
+ 	seq_printf(m, "   Chunks     : %4d (%d bytes)\n",
+-		(int)vc_cma_chunks,
+-		(int)(vc_cma_chunks * VC_CMA_CHUNK_SIZE));
++		   (int)vc_cma_chunks,
++		   (int)(vc_cma_chunks * VC_CMA_CHUNK_SIZE));
+ 	seq_printf(m, "   Used       : %4d (%d bytes)\n",
+-		(int)vc_cma_chunks_used,
+-		(int)(vc_cma_chunks_used * VC_CMA_CHUNK_SIZE));
++		   (int)vc_cma_chunks_used,
++		   (int)(vc_cma_chunks_used * VC_CMA_CHUNK_SIZE));
+ 	seq_printf(m, "   Reserved   : %4d (%d bytes)\n",
+-		(unsigned int)vc_cma_chunks_reserved,
+-		(int)(vc_cma_chunks_reserved * VC_CMA_CHUNK_SIZE));
++		   (unsigned int)vc_cma_chunks_reserved,
++		   (int)(vc_cma_chunks_reserved * VC_CMA_CHUNK_SIZE));
+ 
+ 	for (i = 0; i < vc_cma_reserve_count; i++) {
+ 		struct vc_cma_reserve_user *user = &vc_cma_reserve_users[i];
+ 		seq_printf(m, "     PID %5d: %d bytes\n", user->pid,
+-			user->reserve);
++			   user->reserve);
+ 	}
+ 
+ 	seq_printf(m, "\n");
+@@ -302,11 +307,9 @@ static int vc_cma_proc_open(struct inode *inode, struct file *file)
+ *
+ ***************************************************************************/
+ 
+-static int vc_cma_proc_write(
+-	struct file *file,
+-	const char __user *buffer,
+-	size_t size,
+-	loff_t *ppos)
++static int vc_cma_proc_write(struct file *file,
++			     const char __user *buffer,
++			     size_t size, loff_t *ppos)
+ {
+ 	int rc = -EFAULT;
+ 	char input_str[20];
+@@ -322,7 +325,6 @@ static int vc_cma_proc_write(
+ 		LOG_ERR("%s: failed to get input string", __func__);
+ 		goto out;
+ 	}
+-
+ #define ALLOC_STR "alloc"
+ #define FREE_STR "free"
+ #define DEBUG_STR "debug"
+@@ -337,12 +339,11 @@ static int vc_cma_proc_write(
+ 		LOG_ERR("/proc/vc-cma: alloc %d", size);
+ 		if (size)
+ 			send_vc_msg(VC_CMA_MSG_REQUEST_FREE,
+-				size / VC_CMA_CHUNK_SIZE, 0);
++				    size / VC_CMA_CHUNK_SIZE, 0);
+ 		else
+ 			LOG_ERR("invalid size '%s'", p);
+ 		rc = size;
+-	} else if (strncmp(input_str, FREE_STR,
+-			strlen(FREE_STR)) == 0) {
++	} else if (strncmp(input_str, FREE_STR, strlen(FREE_STR)) == 0) {
+ 		int size;
+ 		char *p = input_str + strlen(FREE_STR);
+ 
+@@ -352,7 +353,7 @@ static int vc_cma_proc_write(
+ 		LOG_ERR("/proc/vc-cma: free %d", size);
+ 		if (size)
+ 			send_vc_msg(VC_CMA_MSG_REQUEST_ALLOC,
+-				size / VC_CMA_CHUNK_SIZE, 0);
++				    size / VC_CMA_CHUNK_SIZE, 0);
+ 		else
+ 			LOG_ERR("invalid size '%s'", p);
+ 		rc = size;
+@@ -382,7 +383,6 @@ out:
+ 	return rc;
+ }
+ 
+-
+ /****************************************************************************
+ *
+ *   File Operations for /proc interface.
+@@ -397,7 +397,6 @@ static const struct file_operations vc_cma_proc_fops = {
+ 	.release = single_release
+ };
+ 
+-
+ static int vc_cma_set_reserve(unsigned int reserve, unsigned int pid)
+ {
+ 	struct vc_cma_reserve_user *user = NULL;
+@@ -445,10 +444,9 @@ static int vc_cma_set_reserve(unsigned int reserve, unsigned int pid)
+ 	vc_cma_reserve_total += delta;
+ 
+ 	send_vc_msg(VC_CMA_MSG_RESERVE,
+-		vc_cma_reserve_total & 0xffff,
+-		vc_cma_reserve_total >> 16);
++		    vc_cma_reserve_total & 0xffff, vc_cma_reserve_total >> 16);
+ 
+-	send_worker_msg((VCHIQ_HEADER_T *)VC_CMA_MSG_UPDATE_RESERVE);
++	send_worker_msg((VCHIQ_HEADER_T *) VC_CMA_MSG_UPDATE_RESERVE);
+ 
+ 	LOG_DBG("/proc/vc-cma: reserve %d (PID %d) - total %u",
+ 		reserve, pid, vc_cma_reserve_total);
+@@ -458,11 +456,10 @@ static int vc_cma_set_reserve(unsigned int reserve, unsigned int pid)
+ 	return vc_cma_reserve_total;
+ }
+ 
+-static VCHIQ_STATUS_T cma_service_callback(
+-	VCHIQ_REASON_T reason,
+-	VCHIQ_HEADER_T *header,
+-	VCHIQ_SERVICE_HANDLE_T service,
+-	void *bulk_userdata)
++static VCHIQ_STATUS_T cma_service_callback(VCHIQ_REASON_T reason,
++					   VCHIQ_HEADER_T * header,
++					   VCHIQ_SERVICE_HANDLE_T service,
++					   void *bulk_userdata)
+ {
+ 	switch (reason) {
+ 	case VCHIQ_MESSAGE_AVAILABLE:
+@@ -479,10 +476,8 @@ static VCHIQ_STATUS_T cma_service_callback(
+ 	return VCHIQ_SUCCESS;
+ }
+ 
+-static void send_vc_msg(
+-	unsigned short type,
+-	unsigned short param1,
+-	unsigned short param2)
++static void send_vc_msg(unsigned short type,
++			unsigned short param1, unsigned short param2)
+ {
+ 	unsigned short msg[] = { type, param1, param2 };
+ 	VCHIQ_ELEMENT_T elem = { &msg, sizeof(msg) };
+@@ -494,7 +489,7 @@ static void send_vc_msg(
+ 		LOG_ERR("vchiq_queue_message returned %x", ret);
+ }
+ 
+-static bool send_worker_msg(VCHIQ_HEADER_T *msg)
++static bool send_worker_msg(VCHIQ_HEADER_T * msg)
+ {
+ 	if (down_interruptible(&vc_cma_worker_queue_push_mutex))
+ 		return false;
+@@ -509,26 +504,33 @@ static int vc_cma_alloc_chunks(int num_chunks, struct cma_msg *reply)
+ 	for (i = 0; i < num_chunks; i++) {
+ 		struct page *chunk;
+ 		unsigned int chunk_num;
+-		chunk = dma_alloc_from_contiguous(
+-			&vc_cma_device.dev,
+-			PAGES_PER_CHUNK,
+-			VC_CMA_CHUNK_ORDER);
++		uint8_t *chunk_addr;
++		size_t chunk_size = PAGES_PER_CHUNK << PAGE_SHIFT;
++
++		chunk = dma_alloc_from_contiguous(&vc_cma_device.dev,
++						  PAGES_PER_CHUNK,
++						  VC_CMA_CHUNK_ORDER);
+ 		if (!chunk)
+ 			break;
++
++		chunk_addr = page_address(chunk);
++		dmac_flush_range(chunk_addr, chunk_addr + chunk_size);
++		outer_inv_range(__pa(chunk_addr), __pa(chunk_addr) +
++			chunk_size);
++
+ 		chunk_num =
+-			(page_to_phys(chunk) - vc_cma_base) /
+-			VC_CMA_CHUNK_SIZE;
++		    (page_to_phys(chunk) - vc_cma_base) / VC_CMA_CHUNK_SIZE;
+ 		BUG_ON(((page_to_phys(chunk) - vc_cma_base) %
+ 			VC_CMA_CHUNK_SIZE) != 0);
+-		if (chunk_num >= vc_cma_chunks)
+-		{
++		if (chunk_num >= vc_cma_chunks) {
+ 			LOG_ERR("%s: ===============================",
+ 				__func__);
+ 			LOG_ERR("%s: chunk phys %x, vc_cma %x-%x - "
+ 				"bad SPARSEMEM configuration?",
+ 				__func__, (unsigned int)page_to_phys(chunk),
+ 				vc_cma_base, vc_cma_base + vc_cma_size - 1);
+-			LOG_ERR("%s: dev->cma_area = %p\n", __func__, vc_cma_device.dev.cma_area);
++			LOG_ERR("%s: dev->cma_area = %p\n", __func__,
++				vc_cma_device.dev.cma_area);
+ 			LOG_ERR("%s: ===============================",
+ 				__func__);
+ 			break;
+@@ -541,8 +543,7 @@ static int vc_cma_alloc_chunks(int num_chunks, struct cma_msg *reply)
+ 		LOG_ERR("%s: dma_alloc_from_contiguous failed "
+ 			"for %x bytes (alloc %d of %d, %d free)",
+ 			__func__, VC_CMA_CHUNK_SIZE, i,
+-			num_chunks,
+-			vc_cma_chunks - vc_cma_chunks_used);
++			num_chunks, vc_cma_chunks - vc_cma_chunks_used);
+ 		num_chunks = i;
+ 	}
+ 
+@@ -554,16 +555,14 @@ static int vc_cma_alloc_chunks(int num_chunks, struct cma_msg *reply)
+ 		VCHIQ_ELEMENT_T elem = {
+ 			reply,
+ 			offsetof(struct cma_msg, params[0]) +
+-				num_chunks * sizeof(reply->params[0])
++			    num_chunks * sizeof(reply->params[0])
+ 		};
+ 		VCHIQ_STATUS_T ret;
+ 		vchiq_use_service(cma_service);
+-		ret = vchiq_queue_message(cma_service,
+-			&elem, 1);
++		ret = vchiq_queue_message(cma_service, &elem, 1);
+ 		vchiq_release_service(cma_service);
+ 		if (ret != VCHIQ_SUCCESS)
+-			LOG_ERR("vchiq_queue_message return "
+-				"%x", ret);
++			LOG_ERR("vchiq_queue_message return " "%x", ret);
+ 	}
+ 
+ 	return num_chunks;
+@@ -601,93 +600,106 @@ static int cma_worker_proc(void *param)
+ 		}
+ 
+ 		switch (type) {
+-		case VC_CMA_MSG_ALLOC: {
+-			int num_chunks, free_chunks;
+-			num_chunks = cma_msg->params[0];
+-			free_chunks = vc_cma_chunks - vc_cma_chunks_used;
+-			LOG_DBG("CMA_MSG_ALLOC(%d chunks)", num_chunks);
+-			if (num_chunks > VC_CMA_MAX_PARAMS_PER_MSG) {
+-				LOG_ERR("CMA_MSG_ALLOC - chunk count (%d) "
+-					"exceeds VC_CMA_MAX_PARAMS_PER_MSG (%d)",
+-					num_chunks, VC_CMA_MAX_PARAMS_PER_MSG);
+-				num_chunks = VC_CMA_MAX_PARAMS_PER_MSG;
+-			}
+-
+-			if (num_chunks > free_chunks) {
+-				LOG_ERR("CMA_MSG_ALLOC - chunk count (%d) "
+-					"exceeds free chunks (%d)",
+-					num_chunks, free_chunks);
+-				num_chunks = free_chunks;
+-			}
+-
+-			vc_cma_alloc_chunks(num_chunks, &reply);
+-		}
+-		break;
+-
+-		case VC_CMA_MSG_FREE: {
+-			int chunk_count =
+-				(msg_size - offsetof(struct cma_msg, params))/
+-				sizeof(cma_msg->params[0]);
+-			int i;
+-			BUG_ON(chunk_count <= 0);
+-
+-			LOG_DBG("CMA_MSG_FREE(%d chunks - %x, ...)",
+-				chunk_count, cma_msg->params[0]);
+-			for (i = 0; i < chunk_count; i++) {
+-				int chunk_num = cma_msg->params[i];
+-				struct page *page = vc_cma_base_page +
+-					chunk_num * PAGES_PER_CHUNK;
+-				if (chunk_num >= vc_cma_chunks) {
+-					LOG_ERR("CMA_MSG_FREE - chunk %d of %d"
+-						" (value %x) exceeds maximum "
+-						"(%x)",
+-						i, chunk_count, chunk_num,
+-						vc_cma_chunks - 1);
+-					break;
++		case VC_CMA_MSG_ALLOC:{
++				int num_chunks, free_chunks;
++				num_chunks = cma_msg->params[0];
++				free_chunks =
++				    vc_cma_chunks - vc_cma_chunks_used;
++				LOG_DBG("CMA_MSG_ALLOC(%d chunks)", num_chunks);
++				if (num_chunks > VC_CMA_MAX_PARAMS_PER_MSG) {
++					LOG_ERR
++					    ("CMA_MSG_ALLOC - chunk count (%d) "
++					     "exceeds VC_CMA_MAX_PARAMS_PER_MSG (%d)",
++					     num_chunks,
++					     VC_CMA_MAX_PARAMS_PER_MSG);
++					num_chunks = VC_CMA_MAX_PARAMS_PER_MSG;
+ 				}
+ 
+-				if (!dma_release_from_contiguous(
+-					&vc_cma_device.dev,
+-					page, PAGES_PER_CHUNK)) {
+-					LOG_ERR("CMA_MSG_FREE - failed to "
+-						"release chunk %d (phys %x, "
+-						"page %x)",
+-						chunk_num, page_to_phys(page),
+-						(unsigned int)page);
++				if (num_chunks > free_chunks) {
++					LOG_ERR
++					    ("CMA_MSG_ALLOC - chunk count (%d) "
++					     "exceeds free chunks (%d)",
++					     num_chunks, free_chunks);
++					num_chunks = free_chunks;
+ 				}
+-				vc_cma_chunks_used--;
++
++				vc_cma_alloc_chunks(num_chunks, &reply);
+ 			}
+-			LOG_DBG("CMA released %d chunks -> %d used",
+-				i, vc_cma_chunks_used);
+-		}
+-		break;
++			break;
+ 
+-		case VC_CMA_MSG_UPDATE_RESERVE: {
+-			int chunks_needed =
+-				((vc_cma_reserve_total + VC_CMA_CHUNK_SIZE - 1)
+-				/ VC_CMA_CHUNK_SIZE) -
+-				vc_cma_chunks_reserved;
++		case VC_CMA_MSG_FREE:{
++				int chunk_count =
++				    (msg_size -
++				     offsetof(struct cma_msg,
++					      params)) /
++				    sizeof(cma_msg->params[0]);
++				int i;
++				BUG_ON(chunk_count <= 0);
++
++				LOG_DBG("CMA_MSG_FREE(%d chunks - %x, ...)",
++					chunk_count, cma_msg->params[0]);
++				for (i = 0; i < chunk_count; i++) {
++					int chunk_num = cma_msg->params[i];
++					struct page *page = vc_cma_base_page +
++					    chunk_num * PAGES_PER_CHUNK;
++					if (chunk_num >= vc_cma_chunks) {
++						LOG_ERR
++						    ("CMA_MSG_FREE - chunk %d of %d"
++						     " (value %x) exceeds maximum "
++						     "(%x)", i, chunk_count,
++						     chunk_num,
++						     vc_cma_chunks - 1);
++						break;
++					}
++
++					if (!dma_release_from_contiguous
++					    (&vc_cma_device.dev, page,
++					     PAGES_PER_CHUNK)) {
++						LOG_ERR
++						    ("CMA_MSG_FREE - failed to "
++						     "release chunk %d (phys %x, "
++						     "page %x)", chunk_num,
++						     page_to_phys(page),
++						     (unsigned int)page);
++					}
++					vc_cma_chunks_used--;
++				}
++				LOG_DBG("CMA released %d chunks -> %d used",
++					i, vc_cma_chunks_used);
++			}
++			break;
+ 
+-			LOG_DBG("CMA_MSG_UPDATE_RESERVE(%d chunks needed)",
+-				chunks_needed);
++		case VC_CMA_MSG_UPDATE_RESERVE:{
++				int chunks_needed =
++				    ((vc_cma_reserve_total + VC_CMA_CHUNK_SIZE -
++				      1)
++				     / VC_CMA_CHUNK_SIZE) -
++				    vc_cma_chunks_reserved;
++
++				LOG_DBG
++				    ("CMA_MSG_UPDATE_RESERVE(%d chunks needed)",
++				     chunks_needed);
++
++				/* Cap the reservations to what is available */
++				if (chunks_needed > 0) {
++					if (chunks_needed >
++					    (vc_cma_chunks -
++					     vc_cma_chunks_used))
++						chunks_needed =
++						    (vc_cma_chunks -
++						     vc_cma_chunks_used);
+ 
+-			/* Cap the reservations to what is available */
+-			if (chunks_needed > 0) {
+-				if (chunks_needed >
+-					(vc_cma_chunks - vc_cma_chunks_used))
+ 					chunks_needed =
+-						(vc_cma_chunks -
+-						vc_cma_chunks_used);
++					    vc_cma_alloc_chunks(chunks_needed,
++								&reply);
++				}
+ 
+-				chunks_needed = vc_cma_alloc_chunks(
+-					chunks_needed, &reply);
++				LOG_DBG
++				    ("CMA_MSG_UPDATE_RESERVE(%d chunks allocated)",
++				     chunks_needed);
++				vc_cma_chunks_reserved += chunks_needed;
+ 			}
+-
+-			LOG_DBG("CMA_MSG_UPDATE_RESERVE(%d chunks allocated)",
+-				chunks_needed);
+-			vc_cma_chunks_reserved += chunks_needed;
+-		}
+-		break;
++			break;
+ 
+ 		default:
+ 			LOG_ERR("unexpected msg type %d", type);
+@@ -699,6 +711,14 @@ static int cma_worker_proc(void *param)
+ 	return 0;
+ }
+ 
++/****************************************************************************
++*
++*   vc_cma_connected_init
++*
++*   This function is called once the videocore has been connected.
++*
++***************************************************************************/
++
+ static void vc_cma_connected_init(void)
+ {
+ 	VCHIQ_SERVICE_PARAMS_T service_params;
+@@ -722,7 +742,7 @@ static void vc_cma_connected_init(void)
+ 	service_params.version_min = VC_CMA_VERSION;
+ 
+ 	if (vchiq_open_service(cma_instance, &service_params,
+-		&cma_service) != VCHIQ_SUCCESS) {
++			       &cma_service) != VCHIQ_SUCCESS) {
+ 		LOG_ERR("failed to open service - already in use?");
+ 		goto fail_vchiq_open;
+ 	}
+@@ -749,58 +769,278 @@ fail_queue:
+ 	return;
+ }
+ 
++void
++loud_error_header(void)
++{
++	if (in_loud_error)
++		return;
+ 
+-/****************************************************************************
+-*
+-*   vc_cma_connected_init
+-*
+-*   This function is called once the videocore has been connected.
+-*
+-***************************************************************************/
++	LOG_ERR("============================================================"
++		"================");
++	LOG_ERR("============================================================"
++		"================");
++	LOG_ERR("=====");
++
++	in_loud_error = 1;
++}
++
++void
++loud_error_footer(void)
++{
++	if (!in_loud_error)
++		return;
++
++	LOG_ERR("=====");
++	LOG_ERR("============================================================"
++		"================");
++	LOG_ERR("============================================================"
++		"================");
++
++	in_loud_error = 0;
++}
++
++#if 1
++static int check_cma_config(void) { return 1; }
++#else
++static int
++read_vc_debug_var(VC_MEM_ACCESS_HANDLE_T handle,
++	const char *symbol,
++	void *buf, size_t bufsize)
++{
++	VC_MEM_ADDR_T vcMemAddr;
++	size_t vcMemSize;
++	uint8_t *mapAddr;
++	off_t  vcMapAddr;
++
++	if (!LookupVideoCoreSymbol(handle, symbol,
++		&vcMemAddr,
++		&vcMemSize)) {
++		loud_error_header();
++		loud_error(
++			"failed to find VC symbol \"%s\".",
++			symbol);
++		loud_error_footer();
++		return 0;
++	}
++
++	if (vcMemSize != bufsize) {
++		loud_error_header();
++		loud_error(
++			"VC symbol \"%s\" is the wrong size.",
++			symbol);
++		loud_error_footer();
++		return 0;
++	}
++
++	vcMapAddr = (off_t)vcMemAddr & VC_MEM_TO_ARM_ADDR_MASK;
++	vcMapAddr += mm_vc_mem_phys_addr;
++	mapAddr = ioremap_nocache(vcMapAddr, vcMemSize);
++	if (mapAddr == 0) {
++		loud_error_header();
++		loud_error(
++			"failed to ioremap \"%s\" @ 0x%x "
++			"(phys: 0x%x, size: %u).",
++			symbol,
++			(unsigned int)vcMapAddr,
++			(unsigned int)vcMemAddr,
++			(unsigned int)vcMemSize);
++		loud_error_footer();
++		return 0;
++	}
++
++	memcpy(buf, mapAddr, bufsize);
++	iounmap(mapAddr);
++
++	return 1;
++}
++
++
++static int
++check_cma_config(void)
++{
++	VC_MEM_ACCESS_HANDLE_T mem_hndl;
++	VC_MEM_ADDR_T mempool_start;
++	VC_MEM_ADDR_T mempool_end;
++	VC_MEM_ADDR_T mempool_offline_start;
++	VC_MEM_ADDR_T mempool_offline_end;
++	VC_MEM_ADDR_T cam_alloc_base;
++	VC_MEM_ADDR_T cam_alloc_size;
++	VC_MEM_ADDR_T cam_alloc_end;
++	int success = 0;
++
++	if (OpenVideoCoreMemory(&mem_hndl) != 0)
++		goto out;
++
++	/* Read the relevant VideoCore variables */
++	if (!read_vc_debug_var(mem_hndl, "__MEMPOOL_START",
++		&mempool_start,
++		sizeof(mempool_start)))
++		goto close;
++
++	if (!read_vc_debug_var(mem_hndl, "__MEMPOOL_END",
++		&mempool_end,
++		sizeof(mempool_end)))
++		goto close;
++
++	if (!read_vc_debug_var(mem_hndl, "__MEMPOOL_OFFLINE_START",
++		&mempool_offline_start,
++		sizeof(mempool_offline_start)))
++		goto close;
++
++	if (!read_vc_debug_var(mem_hndl, "__MEMPOOL_OFFLINE_END",
++		&mempool_offline_end,
++		sizeof(mempool_offline_end)))
++		goto close;
++
++	if (!read_vc_debug_var(mem_hndl, "cam_alloc_base",
++		&cam_alloc_base,
++		sizeof(cam_alloc_base)))
++		goto close;
++
++	if (!read_vc_debug_var(mem_hndl, "cam_alloc_size",
++		&cam_alloc_size,
++		sizeof(cam_alloc_size)))
++		goto close;
++
++	cam_alloc_end = cam_alloc_base + cam_alloc_size;
++
++	success = 1;
++
++	/* Now the sanity checks */
++	if (!mempool_offline_start)
++		mempool_offline_start = mempool_start;
++	if (!mempool_offline_end)
++		mempool_offline_end = mempool_end;
++
++	if (VCADDR_TO_PHYSADDR(mempool_offline_start) != vc_cma_base) {
++		loud_error_header();
++		loud_error(
++			"__MEMPOOL_OFFLINE_START(%x -> %lx) doesn't match "
++			"vc_cma_base(%x)",
++			mempool_offline_start,
++			VCADDR_TO_PHYSADDR(mempool_offline_start),
++			vc_cma_base);
++		success = 0;
++	}
++
++	if (VCADDR_TO_PHYSADDR(mempool_offline_end) !=
++		(vc_cma_base + vc_cma_size)) {
++		loud_error_header();
++		loud_error(
++			"__MEMPOOL_OFFLINE_END(%x -> %lx) doesn't match "
++			"vc_cma_base(%x) + vc_cma_size(%x) = %x",
++			mempool_offline_start,
++			VCADDR_TO_PHYSADDR(mempool_offline_end),
++			vc_cma_base, vc_cma_size, vc_cma_base + vc_cma_size);
++		success = 0;
++	}
++
++	if (mempool_end < mempool_start) {
++		loud_error_header();
++		loud_error(
++			"__MEMPOOL_END(%x) must not be before "
++			"__MEMPOOL_START(%x)",
++			mempool_end,
++			mempool_start);
++		success = 0;
++	}
++
++	if (mempool_offline_end < mempool_offline_start) {
++		loud_error_header();
++		loud_error(
++			"__MEMPOOL_OFFLINE_END(%x) must not be before "
++			"__MEMPOOL_OFFLINE_START(%x)",
++			mempool_offline_end,
++			mempool_offline_start);
++		success = 0;
++	}
++
++	if (mempool_offline_start < mempool_start) {
++		loud_error_header();
++		loud_error(
++			"__MEMPOOL_OFFLINE_START(%x) must not be before "
++			"__MEMPOOL_START(%x)",
++			mempool_offline_start,
++			mempool_start);
++		success = 0;
++	}
++
++	if (mempool_offline_end > mempool_end) {
++		loud_error_header();
++		loud_error(
++			"__MEMPOOL_OFFLINE_END(%x) must not be after "
++			"__MEMPOOL_END(%x)",
++			mempool_offline_end,
++			mempool_end);
++		success = 0;
++	}
++
++	if ((cam_alloc_base < mempool_end) &&
++		(cam_alloc_end > mempool_start)) {
++		loud_error_header();
++		loud_error(
++			"cam_alloc pool(%x-%x) overlaps "
++			"mempool(%x-%x)",
++			cam_alloc_base, cam_alloc_end,
++			mempool_start, mempool_end);
++		success = 0;
++	}
++
++	loud_error_footer();
++
++close:
++	CloseVideoCoreMemory(mem_hndl);
++
++out:
++	return success;
++}
++#endif
+ 
+ static int __init vc_cma_init(void)
+ {
+ 	int rc = -EFAULT;
+ 	struct device *dev;
+ 
++	if (!check_cma_config())
++		goto out_release;
++
+ 	printk(KERN_INFO "vc-cma: Videocore CMA driver\n");
+-	printk(KERN_INFO "vc-cma: vc_cma_base      = 0x%08x\n",
+-			vc_cma_base);
++	printk(KERN_INFO "vc-cma: vc_cma_base      = 0x%08x\n", vc_cma_base);
+ 	printk(KERN_INFO "vc-cma: vc_cma_size      = 0x%08x (%u MiB)\n",
+-			vc_cma_size, vc_cma_size / (1024 * 1024));
++	       vc_cma_size, vc_cma_size / (1024 * 1024));
+ 	printk(KERN_INFO "vc-cma: vc_cma_initial   = 0x%08x (%u MiB)\n",
+-			vc_cma_initial, vc_cma_initial / (1024 * 1024));
++	       vc_cma_initial, vc_cma_initial / (1024 * 1024));
+ 
+ 	vc_cma_base_page = phys_to_page(vc_cma_base);
++
+ 	if (vc_cma_chunks) {
+ 		int chunks_needed = vc_cma_initial / VC_CMA_CHUNK_SIZE;
+ 
+ 		for (vc_cma_chunks_used = 0;
+-			vc_cma_chunks_used < chunks_needed;
+-			vc_cma_chunks_used++) {
++		     vc_cma_chunks_used < chunks_needed; vc_cma_chunks_used++) {
+ 			struct page *chunk;
+ 			chunk = dma_alloc_from_contiguous(&vc_cma_device.dev,
+-				PAGES_PER_CHUNK, VC_CMA_CHUNK_ORDER);
++							  PAGES_PER_CHUNK,
++							  VC_CMA_CHUNK_ORDER);
+ 			if (!chunk)
+ 				break;
+ 			BUG_ON(((page_to_phys(chunk) - vc_cma_base) %
+-				 VC_CMA_CHUNK_SIZE) != 0);
++				VC_CMA_CHUNK_SIZE) != 0);
+ 		}
+ 		if (vc_cma_chunks_used != chunks_needed) {
+ 			LOG_ERR("%s: dma_alloc_from_contiguous failed (%d "
+ 				"bytes, allocation %d of %d)",
+ 				__func__, VC_CMA_CHUNK_SIZE,
+-				vc_cma_chunks_used,
+-				chunks_needed);
++				vc_cma_chunks_used, chunks_needed);
+ 			goto out_release;
+ 		}
++
+ 		vchiq_add_connected_callback(vc_cma_connected_init);
+ 	}
+ 
+ 	rc = alloc_chrdev_region(&vc_cma_devnum, 0, 1, DRIVER_NAME);
+ 	if (rc < 0) {
+-		LOG_ERR("%s: alloc_chrdev_region failed (rc=%d)", __func__,
+-			rc);
++		LOG_ERR("%s: alloc_chrdev_region failed (rc=%d)", __func__, rc);
+ 		goto out_release;
+ 	}
+ 
+@@ -819,7 +1059,7 @@ static int __init vc_cma_init(void)
+ 	}
+ 
+ 	dev = device_create(vc_cma_class, NULL, vc_cma_devnum, NULL,
+-		DRIVER_NAME);
++			    DRIVER_NAME);
+ 	if (IS_ERR(dev)) {
+ 		rc = PTR_ERR(dev);
+ 		LOG_ERR("%s: device_create failed (rc=%d)", __func__, rc);
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
+index 33519ea..2c9859d 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
+@@ -1370,8 +1370,8 @@ dump_phys_mem(void *virt_addr, uint32_t num_bytes)
+ 
+ 	while (offset < end_offset) {
+ 
+-		page_idx = offset / PAGE_SIZE;
+ 		int page_offset = offset % PAGE_SIZE;
++		page_idx = offset / PAGE_SIZE;
+ 
+ 		if (page_idx != prev_idx) {
+ 
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
+index af6fa88..bfd389f 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
+@@ -1202,6 +1202,24 @@ poll_services(VCHIQ_STATE_T *state)
+ 				service_flags =
+ 					atomic_xchg(&service->poll_flags, 0);
+ 				if (service_flags &
++					(1 << VCHIQ_POLL_REMOVE)) {
++					vchiq_log_info(vchiq_core_log_level,
++						"%d: ps - remove %d<->%d",
++						state->id, service->localport,
++						service->remoteport);
++
++					/* Make it look like a client, because
++					   it must be removed and not left in
++					   the LISTENING state. */
++					service->public_fourcc =
++						VCHIQ_FOURCC_INVALID;
++
++					if (vchiq_close_service_internal(
++						service, 0/*!close_recvd*/) !=
++						VCHIQ_SUCCESS)
++						request_poll(state, service,
++							VCHIQ_POLL_REMOVE);
++				} else if (service_flags &
+ 					(1 << VCHIQ_POLL_TERMINATE)) {
+ 					vchiq_log_info(vchiq_core_log_level,
+ 						"%d: ps - terminate %d<->%d",
+@@ -1526,6 +1544,26 @@ parse_rx_slots(VCHIQ_STATE_T *state)
+ 		case VCHIQ_MSG_BULK_RX_DONE:
+ 		case VCHIQ_MSG_BULK_TX_DONE:
+ 			service = find_service_by_port(state, localport);
++			if ((!service || service->remoteport != remoteport) &&
++				(localport == 0) &&
++				(type == VCHIQ_MSG_CLOSE)) {
++				/* This could be a CLOSE from a client which
++				   hadn't yet received the OPENACK - look for
++				   the connected service */
++				if (service)
++					unlock_service(service);
++				service = get_connected_service(state,
++					remoteport);
++				if (service)
++					vchiq_log_warning(vchiq_core_log_level,
++						"%d: prs %s@%x (%d->%d) - "
++						"found connected service %d",
++						state->id, msg_type_str(type),
++						(unsigned int)header,
++						remoteport, localport,
++						service->localport);
++			}
++
+ 			if (!service) {
+ 				vchiq_log_error(vchiq_core_log_level,
+ 					"%d: prs %s@%x (%d->%d) - "
+@@ -1535,6 +1573,7 @@ parse_rx_slots(VCHIQ_STATE_T *state)
+ 					remoteport, localport, localport);
+ 				goto skip_message;
+ 			}
++			break;
+ 		default:
+ 			break;
+ 		}
+@@ -1596,17 +1635,6 @@ parse_rx_slots(VCHIQ_STATE_T *state)
+ 				state->id, (unsigned int)header,
+ 				remoteport, localport);
+ 
+-			if ((service->remoteport != remoteport) &&
+-				VCHIQ_PORT_IS_VALID(service->remoteport)) {
+-				/* This could be from a client which hadn't yet
+-				** received the OPENACK - look for the
+-				** connected service */
+-				service = get_connected_service(state,
+-					remoteport);
+-				if (!service)
+-					break;
+-			}
+-
+ 			mark_service_closing(service);
+ 
+ 			if (vchiq_close_service_internal(service,
+@@ -2782,14 +2810,10 @@ vchiq_terminate_service_internal(VCHIQ_SERVICE_T *service)
+ 	vchiq_log_info(vchiq_core_log_level, "%d: tsi - (%d<->%d)",
+ 		state->id, service->localport, service->remoteport);
+ 
+-	/* Make it look like a client, because it must be removed and not
+-	   left in the LISTENING state. */
+-	service->public_fourcc = VCHIQ_FOURCC_INVALID;
+-
+ 	mark_service_closing(service);
+ 
+-	/* Mark the service for termination by the slot handler */
+-	request_poll(state, service, VCHIQ_POLL_TERMINATE);
++	/* Mark the service for removal by the slot handler */
++	request_poll(state, service, VCHIQ_POLL_REMOVE);
+ }
+ 
+ /* Called from the slot handler */
+@@ -2994,20 +3018,20 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)
+ 		return VCHIQ_ERROR;
+ 	}
+ 
+-	/* Make it look like a client, because it must be removed and not
+-	   left in the LISTENING state. */
+-	service->public_fourcc = VCHIQ_FOURCC_INVALID;
+-
+ 	mark_service_closing(service);
+ 
+ 	if ((service->srvstate == VCHIQ_SRVSTATE_HIDDEN) ||
+ 		(current == service->state->slot_handler_thread)) {
++		/* Make it look like a client, because it must be removed and
++		   not left in the LISTENING state. */
++		service->public_fourcc = VCHIQ_FOURCC_INVALID;
++
+ 		status = vchiq_close_service_internal(service,
+ 			0/*!close_recvd*/);
+ 		BUG_ON(status == VCHIQ_RETRY);
+ 	} else {
+-		/* Mark the service for termination by the slot handler */
+-		request_poll(service->state, service, VCHIQ_POLL_TERMINATE);
++		/* Mark the service for removal by the slot handler */
++		request_poll(service->state, service, VCHIQ_POLL_REMOVE);
+ 	}
+ 	while (1) {
+ 		if (down_interruptible(&service->remove_event) != 0) {
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
+index 9e38aa8..d27d70a 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
+@@ -211,6 +211,7 @@ enum {
+ 
+ enum {
+ 	VCHIQ_POLL_TERMINATE,
++	VCHIQ_POLL_REMOVE,
+ 	VCHIQ_POLL_TXNOTIFY,
+ 	VCHIQ_POLL_RXNOTIFY,
+ 	VCHIQ_POLL_COUNT
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion
+index 9f5b634..77dd613 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion
+@@ -41,11 +41,11 @@ if ( -d "$root/.git" ) {
+ 			$tainted =~ s/[ \r\n]*$//;     # chomp may not be enough (cygwin).
+ 			$tainted =~ s/^[ \r\n]*//;     # chomp may not be enough (cygwin).
+ 			if (length $tainted) {
+-			$version = join ' ', $version, "(tainted)";
+-		}
+-		else {
+-			$version = join ' ', $version, "(clean)";
+-         }
++   			$version = join ' ', $version, "(tainted)";
++   		}
++   		else {
++   			$version = join ' ', $version, "(clean)";
++         }   		
+ 		}
+ 	}
+ }
+@@ -85,3 +85,5 @@ const char *vchiq_get_build_time( void )
+    return vchiq_build_time;
+ }
+ EOF
++
++
diff --git a/patches/linux-3.6.10/0187-Allow-CMA-pool-to-be-shared-with-other-drivers.patch b/patches/linux-3.6.10/0187-Allow-CMA-pool-to-be-shared-with-other-drivers.patch
new file mode 100644
index 0000000..6cf8839
--- /dev/null
+++ b/patches/linux-3.6.10/0187-Allow-CMA-pool-to-be-shared-with-other-drivers.patch
@@ -0,0 +1,48 @@
+From: popcornmix <popcornmix@gmail.com>
+Date: Wed, 28 Nov 2012 16:46:52 +0000
+Subject: [PATCH] Allow CMA pool to be shared with other drivers
+
+---
+ drivers/char/broadcom/vc_cma/vc_cma.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/char/broadcom/vc_cma/vc_cma.c b/drivers/char/broadcom/vc_cma/vc_cma.c
+index 9f2473e..3ba7506 100644
+--- a/drivers/char/broadcom/vc_cma/vc_cma.c
++++ b/drivers/char/broadcom/vc_cma/vc_cma.c
+@@ -179,7 +179,7 @@ void __init vc_cma_reserve(void)
+ 	 * size from the end of memory
+ 	 */
+ 	if (vc_cma_size) {
+-		if (dma_declare_contiguous(&vc_cma_device.dev, vc_cma_size,
++		if (dma_declare_contiguous(NULL /*&vc_cma_device.dev*/, vc_cma_size,
+ 					   vc_cma_base, 0) == 0) {
+ 		} else {
+ 			LOG_ERR("vc_cma: dma_declare_contiguous(%x,%x) failed",
+@@ -507,7 +507,7 @@ static int vc_cma_alloc_chunks(int num_chunks, struct cma_msg *reply)
+ 		uint8_t *chunk_addr;
+ 		size_t chunk_size = PAGES_PER_CHUNK << PAGE_SHIFT;
+ 
+-		chunk = dma_alloc_from_contiguous(&vc_cma_device.dev,
++		chunk = dma_alloc_from_contiguous(NULL /*&vc_cma_device.dev*/,
+ 						  PAGES_PER_CHUNK,
+ 						  VC_CMA_CHUNK_ORDER);
+ 		if (!chunk)
+@@ -653,7 +653,7 @@ static int cma_worker_proc(void *param)
+ 					}
+ 
+ 					if (!dma_release_from_contiguous
+-					    (&vc_cma_device.dev, page,
++					    (NULL /*&vc_cma_device.dev*/, page,
+ 					     PAGES_PER_CHUNK)) {
+ 						LOG_ERR
+ 						    ("CMA_MSG_FREE - failed to "
+@@ -1019,7 +1019,7 @@ static int __init vc_cma_init(void)
+ 		for (vc_cma_chunks_used = 0;
+ 		     vc_cma_chunks_used < chunks_needed; vc_cma_chunks_used++) {
+ 			struct page *chunk;
+-			chunk = dma_alloc_from_contiguous(&vc_cma_device.dev,
++			chunk = dma_alloc_from_contiguous(NULL /*&vc_cma_device.dev*/,
+ 							  PAGES_PER_CHUNK,
+ 							  VC_CMA_CHUNK_ORDER);
+ 			if (!chunk)
diff --git a/patches/linux-3.6.10/0188-Add-CoDel-network-scheduling.-Add-HIDRAW.-Remove-CMA.patch b/patches/linux-3.6.10/0188-Add-CoDel-network-scheduling.-Add-HIDRAW.-Remove-CMA.patch
new file mode 100644
index 0000000..2c9ecde
--- /dev/null
+++ b/patches/linux-3.6.10/0188-Add-CoDel-network-scheduling.-Add-HIDRAW.-Remove-CMA.patch
@@ -0,0 +1,39 @@
+From: popcornmix <popcornmix@gmail.com>
+Date: Wed, 28 Nov 2012 16:49:53 +0000
+Subject: [PATCH] Add CoDel network scheduling. Add HIDRAW. Remove CMA debug
+
+---
+ arch/arm/configs/bcmrpi_defconfig | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
+index 53cc6c2..a01369e 100644
+--- a/arch/arm/configs/bcmrpi_defconfig
++++ b/arch/arm/configs/bcmrpi_defconfig
+@@ -253,6 +253,10 @@ CONFIG_NET_SCH_DRR=m
+ CONFIG_NET_SCH_MQPRIO=m
+ CONFIG_NET_SCH_CHOKE=m
+ CONFIG_NET_SCH_QFQ=m
++CONFIG_NET_SCH_CODEL=m
++CONFIG_NET_SCH_FQ_CODEL=m
++CONFIG_NET_SCH_INGRESS=m
++CONFIG_NET_SCH_PLUG=m
+ CONFIG_NET_CLS_BASIC=m
+ CONFIG_NET_CLS_TCINDEX=m
+ CONFIG_NET_CLS_ROUTE4=m
+@@ -331,7 +335,6 @@ CONFIG_NFC_PN533=m
+ CONFIG_DEVTMPFS=y
+ CONFIG_DEVTMPFS_MOUNT=y
+ CONFIG_CMA=y
+-CONFIG_CMA_DEBUG=y
+ CONFIG_BLK_DEV_LOOP=y
+ CONFIG_BLK_DEV_CRYPTOLOOP=m
+ CONFIG_BLK_DEV_DRBD=m
+@@ -725,6 +728,7 @@ CONFIG_SND_USB_CAIAQ=m
+ CONFIG_SND_USB_CAIAQ_INPUT=y
+ CONFIG_SND_USB_6FIRE=m
+ CONFIG_SOUND_PRIME=m
++CONFIG_HIDRAW=y
+ CONFIG_HID_A4TECH=m
+ CONFIG_HID_ACRUX=m
+ CONFIG_HID_APPLE=m
diff --git a/patches/linux-3.6.10/0189-Default-to-dwc_otp.lpm_enable-0.patch b/patches/linux-3.6.10/0189-Default-to-dwc_otp.lpm_enable-0.patch
new file mode 100644
index 0000000..01cd3b3
--- /dev/null
+++ b/patches/linux-3.6.10/0189-Default-to-dwc_otp.lpm_enable-0.patch
@@ -0,0 +1,21 @@
+From: popcornmix <popcornmix@gmail.com>
+Date: Tue, 11 Dec 2012 18:23:03 +0000
+Subject: [PATCH] Default to dwc_otp.lpm_enable=0
+
+---
+ drivers/usb/host/dwc_otg/dwc_otg_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/usb/host/dwc_otg/dwc_otg_driver.c b/drivers/usb/host/dwc_otg/dwc_otg_driver.c
+index d5d8c4b..25110ca 100644
+--- a/drivers/usb/host/dwc_otg/dwc_otg_driver.c
++++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.c
+@@ -228,7 +228,7 @@ static struct dwc_otg_driver_module_params dwc_otg_module_params = {
+ 	.rx_thr_length = -1,
+ 	.pti_enable = -1,
+ 	.mpi_enable = -1,
+-	.lpm_enable = -1,
++	.lpm_enable = 0,
+ 	.ic_usb_cap = -1,
+ 	.ahb_thr_ratio = -1,
+ 	.power_down = -1,
diff --git a/patches/linux-3.6.10/0190-Add-CONFIG_CFG80211_WEXT-and-CONFIG_MMC_SPI.patch b/patches/linux-3.6.10/0190-Add-CONFIG_CFG80211_WEXT-and-CONFIG_MMC_SPI.patch
new file mode 100644
index 0000000..d0aa8a5
--- /dev/null
+++ b/patches/linux-3.6.10/0190-Add-CONFIG_CFG80211_WEXT-and-CONFIG_MMC_SPI.patch
@@ -0,0 +1,28 @@
+From: popcornmix <popcornmix@gmail.com>
+Date: Tue, 11 Dec 2012 18:24:20 +0000
+Subject: [PATCH] Add CONFIG_CFG80211_WEXT and CONFIG_MMC_SPI
+
+---
+ arch/arm/configs/bcmrpi_defconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
+index a01369e..14d6ebf 100644
+--- a/arch/arm/configs/bcmrpi_defconfig
++++ b/arch/arm/configs/bcmrpi_defconfig
+@@ -325,6 +325,7 @@ CONFIG_BT_MRVL=m
+ CONFIG_BT_MRVL_SDIO=m
+ CONFIG_BT_ATH3K=m
+ CONFIG_CFG80211=m
++CONFIG_CFG80211_WEXT=y
+ CONFIG_MAC80211=m
+ CONFIG_MAC80211_RC_PID=y
+ CONFIG_MAC80211_MESH=y
+@@ -873,6 +874,7 @@ CONFIG_MMC_SDHCI=y
+ CONFIG_MMC_SDHCI_PLTFM=y
+ CONFIG_MMC_SDHCI_BCM2708=y
+ CONFIG_MMC_SDHCI_BCM2708_DMA=y
++CONFIG_MMC_SPI=m
+ CONFIG_LEDS_GPIO=m
+ CONFIG_LEDS_TRIGGER_TIMER=m
+ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
diff --git a/patches/linux-3.6.10/0191-Increase-default-coherent-pool-so-vchiq-starts-up.patch b/patches/linux-3.6.10/0191-Increase-default-coherent-pool-so-vchiq-starts-up.patch
new file mode 100644
index 0000000..0adaa73
--- /dev/null
+++ b/patches/linux-3.6.10/0191-Increase-default-coherent-pool-so-vchiq-starts-up.patch
@@ -0,0 +1,23 @@
+From: popcornmix <popcornmix@gmail.com>
+Date: Tue, 11 Dec 2012 19:04:27 +0000
+Subject: [PATCH] Increase default coherent pool so vchiq starts up
+
+---
+ arch/arm/mach-bcm2708/bcm2708.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
+index 838e0f2..f41cbc0 100644
+--- a/arch/arm/mach-bcm2708/bcm2708.c
++++ b/arch/arm/mach-bcm2708/bcm2708.c
+@@ -923,9 +923,7 @@ void __init bcm2708_init_early(void)
+ 	 * context. Increase size of atomic coherent pool to make sure such
+ 	 * the allocations won't fail.
+ 	 */
+-#if !defined(CONFIG_BCM_VC_CMA)
+-	init_dma_coherent_pool_size(SZ_2M);
+-#endif
++	init_dma_coherent_pool_size(SZ_4M);
+ }
+ 
+ static void __init board_reserve(void)
diff --git a/patches/linux-3.6.10/0192-net-use-bigger-pages-in-__netdev_alloc_frag.patch b/patches/linux-3.6.10/0192-net-use-bigger-pages-in-__netdev_alloc_frag.patch
new file mode 100644
index 0000000..29a4f9a
--- /dev/null
+++ b/patches/linux-3.6.10/0192-net-use-bigger-pages-in-__netdev_alloc_frag.patch
@@ -0,0 +1,110 @@
+From: Eric Dumazet <edumazet@google.com>
+Date: Wed, 26 Sep 2012 06:46:57 +0000
+Subject: [PATCH] net: use bigger pages in __netdev_alloc_frag
+
+We currently use percpu order-0 pages in __netdev_alloc_frag
+to deliver fragments used by __netdev_alloc_skb()
+
+Depending on NIC driver and arch being 32 or 64 bit, it allows a page to
+be split in several fragments (between 1 and 8), assuming PAGE_SIZE=4096
+
+Switching to bigger pages (32768 bytes for PAGE_SIZE=4096 case) allows :
+
+- Better filling of space (the ending hole overhead is less an issue)
+
+- Less calls to page allocator or accesses to page->_count
+
+- Could allow struct skb_shared_info futures changes without major
+  performance impact.
+
+This patch implements a transparent fallback to smaller
+pages in case of memory pressure.
+
+It also uses a standard "struct page_frag" instead of a custom one.
+
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Cc: Alexander Duyck <alexander.h.duyck@intel.com>
+Cc: Benjamin LaHaise <bcrl@kvack.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/core/skbuff.c | 46 ++++++++++++++++++++++++++++++----------------
+ 1 file changed, 30 insertions(+), 16 deletions(-)
+
+diff --git a/net/core/skbuff.c b/net/core/skbuff.c
+index 9708777..35f9805 100644
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -340,43 +340,57 @@ struct sk_buff *build_skb(void *data, unsigned int frag_size)
+ EXPORT_SYMBOL(build_skb);
+ 
+ struct netdev_alloc_cache {
+-	struct page *page;
+-	unsigned int offset;
+-	unsigned int pagecnt_bias;
++	struct page_frag	frag;
++	/* we maintain a pagecount bias, so that we dont dirty cache line
++	 * containing page->_count every time we allocate a fragment.
++	 */
++	unsigned int		pagecnt_bias;
+ };
+ static DEFINE_PER_CPU(struct netdev_alloc_cache, netdev_alloc_cache);
+ 
+-#define NETDEV_PAGECNT_BIAS (PAGE_SIZE / SMP_CACHE_BYTES)
++#define NETDEV_FRAG_PAGE_MAX_ORDER get_order(32768)
++#define NETDEV_FRAG_PAGE_MAX_SIZE  (PAGE_SIZE << NETDEV_FRAG_PAGE_MAX_ORDER)
++#define NETDEV_PAGECNT_MAX_BIAS	   NETDEV_FRAG_PAGE_MAX_SIZE
+ 
+ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
+ {
+ 	struct netdev_alloc_cache *nc;
+ 	void *data = NULL;
++	int order;
+ 	unsigned long flags;
+ 
+ 	local_irq_save(flags);
+ 	nc = &__get_cpu_var(netdev_alloc_cache);
+-	if (unlikely(!nc->page)) {
++	if (unlikely(!nc->frag.page)) {
+ refill:
+-		nc->page = alloc_page(gfp_mask);
+-		if (unlikely(!nc->page))
+-			goto end;
++		for (order = NETDEV_FRAG_PAGE_MAX_ORDER; ;) {
++			gfp_t gfp = gfp_mask;
++
++			if (order)
++				gfp |= __GFP_COMP | __GFP_NOWARN;
++			nc->frag.page = alloc_pages(gfp, order);
++			if (likely(nc->frag.page))
++				break;
++			if (--order < 0)
++				goto end;
++		}
++		nc->frag.size = PAGE_SIZE << order;
+ recycle:
+-		atomic_set(&nc->page->_count, NETDEV_PAGECNT_BIAS);
+-		nc->pagecnt_bias = NETDEV_PAGECNT_BIAS;
+-		nc->offset = 0;
++		atomic_set(&nc->frag.page->_count, NETDEV_PAGECNT_MAX_BIAS);
++		nc->pagecnt_bias = NETDEV_PAGECNT_MAX_BIAS;
++		nc->frag.offset = 0;
+ 	}
+ 
+-	if (nc->offset + fragsz > PAGE_SIZE) {
++	if (nc->frag.offset + fragsz > nc->frag.size) {
+ 		/* avoid unnecessary locked operations if possible */
+-		if ((atomic_read(&nc->page->_count) == nc->pagecnt_bias) ||
+-		    atomic_sub_and_test(nc->pagecnt_bias, &nc->page->_count))
++		if ((atomic_read(&nc->frag.page->_count) == nc->pagecnt_bias) ||
++		    atomic_sub_and_test(nc->pagecnt_bias, &nc->frag.page->_count))
+ 			goto recycle;
+ 		goto refill;
+ 	}
+ 
+-	data = page_address(nc->page) + nc->offset;
+-	nc->offset += fragsz;
++	data = page_address(nc->frag.page) + nc->frag.offset;
++	nc->frag.offset += fragsz;
+ 	nc->pagecnt_bias--;
+ end:
+ 	local_irq_restore(flags);
diff --git a/patches/linux-3.6.10/0193-Bluetooth-Increase-HCI-command-tx-timeout.patch b/patches/linux-3.6.10/0193-Bluetooth-Increase-HCI-command-tx-timeout.patch
new file mode 100644
index 0000000..2feed76
--- /dev/null
+++ b/patches/linux-3.6.10/0193-Bluetooth-Increase-HCI-command-tx-timeout.patch
@@ -0,0 +1,38 @@
+From: Szymon Janc <szymon.janc@tieto.com>
+Date: Mon, 12 Nov 2012 10:01:05 +0100
+Subject: [PATCH] Bluetooth: Increase HCI command tx timeout
+
+Bluetooth: Increase HCI command tx timeout
+
+Read Local OOB Data command can take more than 1 second on some chips.
+e.g. on CSR 0a12:0001 first call to Read Local OOB Data after reset
+takes about 1300ms resulting in tx timeout error.
+
+[27698.368655] Bluetooth: hci0 command 0x0c57 tx timeout
+
+2012-10-31 15:53:36.178585 < HCI Command: Read Local OOB Data (0x03|0x0057) plen 0
+2012-10-31 15:53:37.496996 > HCI Event: Command Complete (0x0e) plen 36
+    Read Local OOB Data (0x03|0x0057) ncmd 1
+    status 0x00
+    hash 0x92219d9b447f2aa9dc12dda2ae7bae6a
+    randomizer 0xb1948d0febe4ea38ce85c4e66313beba
+
+Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
+Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
+---
+ include/net/bluetooth/hci.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
+index ccd723e..041b374 100644
+--- a/include/net/bluetooth/hci.h
++++ b/include/net/bluetooth/hci.h
+@@ -142,7 +142,7 @@ enum {
+ #define HCI_DISCONN_TIMEOUT	msecs_to_jiffies(2000)	/* 2 seconds */
+ #define HCI_PAIRING_TIMEOUT	msecs_to_jiffies(60000)	/* 60 seconds */
+ #define HCI_INIT_TIMEOUT	msecs_to_jiffies(10000)	/* 10 seconds */
+-#define HCI_CMD_TIMEOUT		msecs_to_jiffies(1000)	/* 1 second */
++#define HCI_CMD_TIMEOUT		msecs_to_jiffies(2000)	/* 2 seconds */
+ #define HCI_ACL_TX_TIMEOUT	msecs_to_jiffies(45000)	/* 45 seconds */
+ #define HCI_AUTO_OFF_TIMEOUT	msecs_to_jiffies(2000)	/* 2 seconds */
+ 
diff --git a/patches/linux-3.6.10/0194-Dual-licence-Broadcom-code-under-BSD-and-GPL.patch b/patches/linux-3.6.10/0194-Dual-licence-Broadcom-code-under-BSD-and-GPL.patch
new file mode 100644
index 0000000..67bee16
--- /dev/null
+++ b/patches/linux-3.6.10/0194-Dual-licence-Broadcom-code-under-BSD-and-GPL.patch
@@ -0,0 +1,1581 @@
+From: popcornmix <popcornmix@gmail.com>
+Date: Mon, 17 Dec 2012 17:48:12 +0000
+Subject: [PATCH] Dual licence Broadcom code under BSD and GPL
+
+---
+ drivers/char/broadcom/vc_cma/vc_cma.c              | 45 +++++++++++-----
+ .../interface/vchi/connections/connection.h        | 39 +++++++++-----
+ .../interface/vchi/message_drivers/message.h       | 39 +++++++++-----
+ drivers/misc/vc04_services/interface/vchi/vchi.h   | 39 +++++++++-----
+ .../misc/vc04_services/interface/vchi/vchi_cfg.h   | 39 +++++++++-----
+ .../interface/vchi/vchi_cfg_internal.h             | 39 +++++++++-----
+ .../vc04_services/interface/vchi/vchi_common.h     | 39 +++++++++-----
+ .../misc/vc04_services/interface/vchi/vchi_mh.h    | 41 ++++++++++-----
+ .../misc/vc04_services/interface/vchiq_arm/vchiq.h | 41 ++++++++++-----
+ .../vc04_services/interface/vchiq_arm/vchiq_2835.h | 41 ++++++++++-----
+ .../interface/vchiq_arm/vchiq_2835_arm.c           | 41 ++++++++++-----
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c  | 41 ++++++++++-----
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.h  | 41 ++++++++++-----
+ .../interface/vchiq_arm/vchiq_build_info.h         | 41 ++++++++++-----
+ .../vc04_services/interface/vchiq_arm/vchiq_cfg.h  | 41 ++++++++++-----
+ .../interface/vchiq_arm/vchiq_connected.c          | 45 +++++++++++-----
+ .../interface/vchiq_arm/vchiq_connected.h          | 45 +++++++++++-----
+ .../vc04_services/interface/vchiq_arm/vchiq_core.c | 61 ++++++++++++++++------
+ .../vc04_services/interface/vchiq_arm/vchiq_core.h | 41 ++++++++++-----
+ .../vc04_services/interface/vchiq_arm/vchiq_if.h   | 41 ++++++++++-----
+ .../interface/vchiq_arm/vchiq_ioctl.h              | 41 ++++++++++-----
+ .../interface/vchiq_arm/vchiq_kern_lib.c           | 45 +++++++++++-----
+ .../interface/vchiq_arm/vchiq_memdrv.h             | 45 +++++++++++-----
+ .../interface/vchiq_arm/vchiq_pagelist.h           | 41 ++++++++++-----
+ .../vc04_services/interface/vchiq_arm/vchiq_proc.c | 41 ++++++++++-----
+ .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 47 +++++++++++------
+ .../vc04_services/interface/vchiq_arm/vchiq_util.c | 41 ++++++++++-----
+ .../vc04_services/interface/vchiq_arm/vchiq_util.h | 41 ++++++++++-----
+ .../interface/vchiq_arm/vchiq_version.c            | 32 ++++++++++++
+ 29 files changed, 849 insertions(+), 365 deletions(-)
+
+diff --git a/drivers/char/broadcom/vc_cma/vc_cma.c b/drivers/char/broadcom/vc_cma/vc_cma.c
+index 3ba7506..32dc832 100644
+--- a/drivers/char/broadcom/vc_cma/vc_cma.c
++++ b/drivers/char/broadcom/vc_cma/vc_cma.c
+@@ -1,16 +1,35 @@
+-/*****************************************************************************
+-* Copyright 2012 Broadcom Corporation.  All rights reserved.
+-*
+-* Unless you and Broadcom execute a separate written software license
+-* agreement governing use of this software, this software is licensed to you
+-* under the terms of the GNU General Public License version 2, available at
+-* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
+-*
+-* Notwithstanding the above, under no circumstances may you combine this
+-* software in any way with any other Broadcom software provided under a
+-* license other than the GPL, without Broadcom's express prior written
+-* consent.
+-*****************************************************************************/
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
++ *
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
+ 
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+diff --git a/drivers/misc/vc04_services/interface/vchi/connections/connection.h b/drivers/misc/vc04_services/interface/vchi/connections/connection.h
+index f4e8225..fef6ac3 100644
+--- a/drivers/misc/vc04_services/interface/vchi/connections/connection.h
++++ b/drivers/misc/vc04_services/interface/vchi/connections/connection.h
+@@ -1,19 +1,34 @@
+-/*
++/**
+  * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef CONNECTION_H_
+diff --git a/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h b/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h
+index 1e2da83..8b3f767 100644
+--- a/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h
++++ b/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h
+@@ -1,19 +1,34 @@
+-/*
++/**
+  * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef _VCHI_MESSAGE_H_
+diff --git a/drivers/misc/vc04_services/interface/vchi/vchi.h b/drivers/misc/vc04_services/interface/vchi/vchi.h
+index 7a7612d..ee908e2 100644
+--- a/drivers/misc/vc04_services/interface/vchi/vchi.h
++++ b/drivers/misc/vc04_services/interface/vchi/vchi.h
+@@ -1,19 +1,34 @@
+-/*
++/**
+  * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef VCHI_H_
+diff --git a/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h b/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h
+index df02282..26bc2d3 100644
+--- a/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h
++++ b/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h
+@@ -1,19 +1,34 @@
+-/*
++/**
+  * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef VCHI_CFG_H_
+diff --git a/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h b/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h
+index f334e4c..35dcba4 100644
+--- a/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h
++++ b/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h
+@@ -1,19 +1,34 @@
+-/*
++/**
+  * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef VCHI_CFG_INTERNAL_H_
+diff --git a/drivers/misc/vc04_services/interface/vchi/vchi_common.h b/drivers/misc/vc04_services/interface/vchi/vchi_common.h
+index b3aa5e7..9e6c00e 100644
+--- a/drivers/misc/vc04_services/interface/vchi/vchi_common.h
++++ b/drivers/misc/vc04_services/interface/vchi/vchi_common.h
+@@ -1,19 +1,34 @@
+-/*
++/**
+  * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef VCHI_COMMON_H_
+diff --git a/drivers/misc/vc04_services/interface/vchi/vchi_mh.h b/drivers/misc/vc04_services/interface/vchi/vchi_mh.h
+index 9dc3a37..198bd07 100644
+--- a/drivers/misc/vc04_services/interface/vchi/vchi_mh.h
++++ b/drivers/misc/vc04_services/interface/vchi/vchi_mh.h
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef VCHI_MH_H_
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h
+index 9c359c0..f87dcbd 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef VCHIQ_VCHIQ_H
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h
+index 959405e..7ea5c64 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef VCHIQ_2835_H
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+index 7f78246..2b5fa56 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #include <linux/kernel.h>
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
+index 2c9859d..2a46d29 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #include <linux/kernel.h>
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h
+index bc0527d..75ad4c6 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef VCHIQ_ARM_H
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h
+index 7c3ab94..df64581 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ const char *vchiq_get_build_hostname(void);
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h
+index bd7f793..2489d9d 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef VCHIQ_CFG_H
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c
+index 2927d4b..65f4b52 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c
+@@ -1,16 +1,35 @@
+-/*****************************************************************************
+-* Copyright 2001 - 2010 Broadcom Corporation.  All rights reserved.
+-*
+-* Unless you and Broadcom execute a separate written software license
+-* agreement governing use of this software, this software is licensed to you
+-* under the terms of the GNU General Public License version 2, available at
+-* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
+-*
+-* Notwithstanding the above, under no circumstances may you combine this
+-* software in any way with any other Broadcom software provided under a
+-* license other than the GPL, without Broadcom's express prior written
+-* consent.
+-*****************************************************************************/
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
++ *
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
+ 
+ #include "vchiq_connected.h"
+ #include "vchiq_core.h"
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h
+index f62faf0..e4cfdcc 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h
+@@ -1,16 +1,35 @@
+-/*****************************************************************************
+-* Copyright 2001 - 2010 Broadcom Corporation.  All rights reserved.
+-*
+-* Unless you and Broadcom execute a separate written software license
+-* agreement governing use of this software, this software is licensed to you
+-* under the terms of the GNU General Public License version 2, available at
+-* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
+-*
+-* Notwithstanding the above, under no circumstances may you combine this
+-* software in any way with any other Broadcom software provided under a
+-* license other than the GPL, without Broadcom's express prior written
+-* consent.
+-*****************************************************************************/
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
++ *
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
+ 
+ #ifndef VCHIQ_CONNECTED_H
+ #define VCHIQ_CONNECTED_H
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
+index bfd389f..4b8d7cf 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #include "vchiq_core.h"
+@@ -287,7 +302,7 @@ vchiq_get_service_fourcc(VCHIQ_SERVICE_HANDLE_T handle)
+ }
+ 
+ static void
+-mark_service_closing(VCHIQ_SERVICE_T *service)
++mark_service_closing_internal(VCHIQ_SERVICE_T *service, int sh_thread)
+ {
+ 	VCHIQ_STATE_T *state = service->state;
+ 	VCHIQ_SERVICE_QUOTA_T *service_quota;
+@@ -297,14 +312,26 @@ mark_service_closing(VCHIQ_SERVICE_T *service)
+ 	/* Synchronise with other threads. */
+ 	mutex_lock(&state->recycle_mutex);
+ 	mutex_unlock(&state->recycle_mutex);
+-	mutex_lock(&state->slot_mutex);
+-	mutex_unlock(&state->slot_mutex);
++	if (!sh_thread || (state->conn_state != VCHIQ_CONNSTATE_PAUSE_SENT)) {
++		/* If we're pausing then the slot_mutex is held until resume
++		 * by the slot handler.  Therefore don't try to acquire this
++		 * mutex if we're the slot handler and in the pause sent state.
++		 * We don't need to in this case anyway. */
++		mutex_lock(&state->slot_mutex);
++		mutex_unlock(&state->slot_mutex);
++	}
+ 
+ 	/* Unblock any sending thread. */
+ 	service_quota = &state->service_quotas[service->localport];
+ 	up(&service_quota->quota_event);
+ }
+ 
++static void
++mark_service_closing(VCHIQ_SERVICE_T *service)
++{
++	mark_service_closing_internal(service, 0);
++}
++
+ static inline VCHIQ_STATUS_T
+ make_service_callback(VCHIQ_SERVICE_T *service, VCHIQ_REASON_T reason,
+ 	VCHIQ_HEADER_T *header, void *bulk_userdata)
+@@ -1635,7 +1662,7 @@ parse_rx_slots(VCHIQ_STATE_T *state)
+ 				state->id, (unsigned int)header,
+ 				remoteport, localport);
+ 
+-			mark_service_closing(service);
++			mark_service_closing_internal(service, 1);
+ 
+ 			if (vchiq_close_service_internal(service,
+ 				1/*close_recvd*/) == VCHIQ_RETRY)
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
+index d27d70a..6952819 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef VCHIQ_CORE_H
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h
+index 2e775b4..3ef118f 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef VCHIQ_IF_H
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
+index 9bcacd2..c5a0158 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef VCHIQ_IOCTLS_H
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
+index 088b486..87474a2 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
+@@ -1,16 +1,35 @@
+-/*****************************************************************************
+-* Copyright 2001 - 2011 Broadcom Corporation.  All rights reserved.
+-*
+-* Unless you and Broadcom execute a separate written software license
+-* agreement governing use of this software, this software is licensed to you
+-* under the terms of the GNU General Public License version 2, available at
+-* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
+-*
+-* Notwithstanding the above, under no circumstances may you combine this
+-* software in any way with any other Broadcom software provided under a
+-* license other than the GPL, without Broadcom's express prior written
+-* consent.
+-*****************************************************************************/
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
++ *
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
+ 
+ /* ---- Include Files ---------------------------------------------------- */
+ 
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
+index e53ee0e..d02e776 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
+@@ -1,16 +1,35 @@
+-/*****************************************************************************
+-* Copyright 2001 - 2010 Broadcom Corporation.  All rights reserved.
+-*
+-* Unless you and Broadcom execute a separate written software license
+-* agreement governing use of this software, this software is licensed to you
+-* under the terms of the GNU General Public License version 2, available at
+-* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
+-*
+-* Notwithstanding the above, under no circumstances may you combine this
+-* software in any way with any other Broadcom software provided under a
+-* license other than the GPL, without Broadcom's express prior written
+-* consent.
+-*****************************************************************************/
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
++ *
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
+ 
+ #ifndef VCHIQ_MEMDRV_H
+ #define VCHIQ_MEMDRV_H
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
+index e8d4e30..54a3ece 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef VCHIQ_PAGELIST_H
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c
+index 07e0ed5..1cda5a6 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2012 Broadcom Corporation. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ 
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
+index 0ed884e..e682013 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
++ *
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ #include <linux/module.h>
+ #include <linux/types.h>
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c
+index 8ea8bea..03cece5 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #include "vchiq_util.h"
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h
+index 948503d..7c4bf7c 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h
+@@ -1,19 +1,34 @@
+-/*
+- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef VCHIQ_UTIL_H
+diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c
+index 87bea8b..b6bfa21 100644
+--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c
++++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c
+@@ -1,3 +1,35 @@
++/**
++ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the above-listed copyright holders may not be used
++ *    to endorse or promote products derived from this software without
++ *    specific prior written permission.
++ *
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2, as published by the Free
++ * Software Foundation.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
+ #include "vchiq_build_info.h"
+ #include <linux/broadcom/vc_debug_sym.h>
+ 
diff --git a/patches/linux-3.6.7/0201-Release-raspberrypi-20121120.patch b/patches/linux-3.6.10/0201-Release-raspberrypi-20121217.patch
index a948d62..9050264 100644
--- a/patches/linux-3.6.7/0201-Release-raspberrypi-20121120.patch
+++ b/patches/linux-3.6.10/0201-Release-raspberrypi-20121217.patch
@@ -1,6 +1,6 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 20 Nov 2012 07:45:52 +0100
-Subject: [PATCH] Release raspberrypi/20121120
+Date: Mon, 17 Dec 2012 22:54:15 +0100
+Subject: [PATCH] Release raspberrypi/20121217
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -8,15 +8,15 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 07f2308..816cd53 100644
+index 686b83c..0240f39 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 6
- SUBLEVEL = 7
+ SUBLEVEL = 10
 -EXTRAVERSION =
-+EXTRAVERSION =-20121120
++EXTRAVERSION =-20121217
  NAME = Terrified Chipmunk
  
  # *DOCUMENTATION*
diff --git a/patches/linux-3.6.7/series b/patches/linux-3.6.10/series
index e2e8109..bc00e72 100644
--- a/patches/linux-3.6.7/series
+++ b/patches/linux-3.6.10/series
@@ -1,9 +1,9 @@
-# umpf-base: v3.6.7
+# umpf-base: v3.6.10
 # umpf-name: raspberrypi
-# umpf-version: raspberrypi/20121120
+# umpf-version: raspberrypi/20121217
 # umpf-topic: rpi-3.6.y
-# umpf-hashinfo: 5fe0247c8d24df4a15589f01809368a2f938935b
-# umpf-topic-range: 9f3dc4baa6813f64f89ce408dc93bdcba38ba022..616b92d3e834ac45950fdb3f7015c0160364c940
+# umpf-hashinfo: d21d26ebd773ab87888351220739b43a9733233a
+# umpf-topic-range: a63a7cf3fc2ac1aff657f58ea446c34f3252209a..580ab44564aa8b60d86527d9615ebd32e84e366d
 0001-Add-dwc_otg-driver.patch
 0002-Main-bcm2708-linux-port.patch
 0003-bcm2708-watchdog-driver.patch
@@ -181,7 +181,24 @@
 0175-Add-missing-options-from-more-recent-3.2.27-kernel-c.patch
 0176-lirc-added-support-for-RaspberryPi-GPIO.patch
 0177-Enable-building-of-lirc-rpi.patch
-# umpf-release: raspberrypi/20121120
-# umpf-topic-range: 616b92d3e834ac45950fdb3f7015c0160364c940..2fa2312469b45410e563a17a3882b6abc5e3eb06
-0201-Release-raspberrypi-20121120.patch
+0178-Update-list-of-modules-build-with-next-kernel.-Fixes.patch
+0179-Avoid-the-high-load-and-block-task-messages-by-start.patch
+0180-Enable-CMA-in-defconfig.patch
+0181-Avoid-undefined-symbol-in-radio-shark.ko.patch
+0182-Allow-mailbox-driver-to-be-called-from-user-code-tho.patch
+0183-usbnet-ratelimit-kevent-may-have-been-dropped-warnin.patch
+0184-Lazy-CRC-quirk-Implemented-retrying-mechanisms-for-S.patch
+0185-Leave-missing_status-enabled-for-now.patch
+0186-Update-to-latest-cma-and-vchiq.patch
+0187-Allow-CMA-pool-to-be-shared-with-other-drivers.patch
+0188-Add-CoDel-network-scheduling.-Add-HIDRAW.-Remove-CMA.patch
+0189-Default-to-dwc_otp.lpm_enable-0.patch
+0190-Add-CONFIG_CFG80211_WEXT-and-CONFIG_MMC_SPI.patch
+0191-Increase-default-coherent-pool-so-vchiq-starts-up.patch
+0192-net-use-bigger-pages-in-__netdev_alloc_frag.patch
+0193-Bluetooth-Increase-HCI-command-tx-timeout.patch
+0194-Dual-licence-Broadcom-code-under-BSD-and-GPL.patch
+# umpf-release: raspberrypi/20121217
+# umpf-topic-range: 580ab44564aa8b60d86527d9615ebd32e84e366d..317ff0e27dc59890f4609c08321b1361bee5eb49
+0201-Release-raspberrypi-20121217.patch
 # umpf-end
diff --git a/platformconfig b/platformconfig
index ce0f1b6..9a3313d 100644
--- a/platformconfig
+++ b/platformconfig
@@ -83,8 +83,8 @@ PTXCONF_KERNEL=y
 PTXCONF_KERNEL_MODULES=y
 PTXCONF_KERNEL_MODULES_INSTALL=y
 PTXCONF_KERNEL_MODULES_BUILD="modules"
-PTXCONF_KERNEL_VERSION="3.6.7"
-PTXCONF_KERNEL_MD5="089209f655c8811db20d8b6ff37a8093"
+PTXCONF_KERNEL_VERSION="3.6.10"
+PTXCONF_KERNEL_MD5="a8c2dcd268d3ca2b81908990abd5d382"
 PTXCONF_KERNEL_ARCH_STRING="arm"
 # PTXCONF_KERNEL_IMAGE_BZ is not set
 PTXCONF_KERNEL_IMAGE_Z=y
author	Michael Olbrich <m.olbrich@pengutronix.de>	2012-12-17 23:04:49 +0100
committer	Michael Olbrich <m.olbrich@pengutronix.de>	2012-12-17 23:04:49 +0100
commit	ca936e7bb48e28b5d6c281135d336570131c224b (patch)
tree	95cb04bb9edce43992b8ccce978a448a254ad7e2
parent	82123838fa8885ad1d6994792841896ed9c08e23 (diff)
download	platform-pengutronix-raspberrypi-ca936e7bb48e28b5d6c281135d336570131c224b.tar.gz platform-pengutronix-raspberrypi-ca936e7bb48e28b5d6c281135d336570131c224b.tar.xz