3.8: update to latest mainline, drop applied patches

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

patch.sh

@@ -22,7 +22,7 @@ EXTRATAG=""
 
 EXTERNAL_TREE="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
 EXTERNAL_BRANCH="master"
-EXTERNAL_SHA="949db153b6466c6f7cad5a427ecea94985927311"
+EXTERNAL_SHA="2e51b231a8d716ea5aacde0bd95ac789cea195b0"
 
 PATCHSET="dma rtc pinctrl cpufreq adc i2c da8xx-fb pwm mmc crypto 6lowpan capebus arm omap omap_sakoman omap_beagle_expansion omap_beagle omap_panda net drm not-capebus pru usb PG2 reboot iio"
 
@@ -82,7 +82,7 @@ for patchset in ${PATCHSET} ; do
 	mkdir -p ${EXPORTPATH}/$patchset
 	for patch in $(ls -1 ${PATCHPATH}/$patchset/*.patch | sort -n) ; do
 		$ECHO -n "$patch: "
-		git am -3 -q $patch && echo applied || exit 1
+		git am -q $patch && echo applied || exit 1
 	done
 
 	NEWCOMMIT="$(git log --oneline --no-abbrev -1 | awk '{print $1}')"

patches/dma/0001-Without-MACH_-option-Early-printk-DEBUG_LL.patch

@@ -1,7 +1,7 @@
-From 5a8b203ca02073210ea7c98aef714abffe992713 Mon Sep 17 00:00:00 2001
+From f94b92981f71cfd208697d88a4f0a5f4c122e7de Mon Sep 17 00:00:00 2001
 From: "hvaibhav@ti.com" <hvaibhav@ti.com>
 Date: Fri, 31 Aug 2012 16:47:12 +0000
-Subject: [PATCH 01/36] Without MACH_ option Early printk (DEBUG_LL)
+Subject: [PATCH 01/35] Without MACH_ option Early printk (DEBUG_LL)
 
 On Fri, Aug 31, 2012 at 22:07:37, Hiremath, Vaibhav wrote:
 > On Fri, Aug 31, 2012 at 21:41:22, Tony Lindgren wrote:

patches/dma/0002-ARM-OMAP-Hack-AM33xx-clock-data-to-allow-JTAG-use.patch

@@ -1,7 +1,7 @@
-From fee5202aa64dfe174e4577066ca47a07a9a47f65 Mon Sep 17 00:00:00 2001
+From 42ead96f580a088dcb3ed756fc86d472b63e5ace Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Mon, 7 Jan 2013 11:55:00 -0500
-Subject: [PATCH 02/36] ARM: OMAP: Hack AM33xx clock data to allow JTAG use
+Subject: [PATCH 02/35] ARM: OMAP: Hack AM33xx clock data to allow JTAG use
 
 The debugss interface clock must remain enabled at init
 in order to prevent an attached JTAG probe from hanging.

patches/dma/0003-fb-Rework-locking-to-fix-lock-ordering-on-takeover.patch

@@ -1,7 +1,7 @@
-From ef7a4c1c00f3f860b0c31b1a454ebdbe8fc208b7 Mon Sep 17 00:00:00 2001
+From 0677cc95079acb44e6bcf645c6376e674e726809 Mon Sep 17 00:00:00 2001
 From: Alan Cox <alan@lxorguk.ukuu.org.uk>
 Date: Fri, 16 Nov 2012 19:27:11 +0000
-Subject: [PATCH 03/36] fb: Rework locking to fix lock ordering on takeover
+Subject: [PATCH 03/35] fb: Rework locking to fix lock ordering on takeover
 
 [The fb maintainer appears to be absent at the moment].
 

patches/dma/0004-video-st7735fb-add-st7735-framebuffer-driver.patch

@@ -1,7 +1,7 @@
-From e2894df2cee5e1975aeff0d4ae1132319da2c7e3 Mon Sep 17 00:00:00 2001
+From e24cd388227d62683637964e8816f449efab01de Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Tue, 11 Sep 2012 15:30:10 -0400
-Subject: [PATCH 04/36] video: st7735fb: add st7735 framebuffer driver
+Subject: [PATCH 04/35] video: st7735fb: add st7735 framebuffer driver
 
 Add driver for the SPI-connected ST7735 display controller.
 This driver requires that the platform support DT booting.

patches/dma/0006-dmaengine-add-helper-function-to-request-a-slave-DMA.patch → patches/dma/0005-dmaengine-add-helper-function-to-request-a-slave-DMA.patch

@@ -1,7 +1,7 @@
-From 3ecb5f03b980fbd63826f7eb9d7bf2a47880f245 Mon Sep 17 00:00:00 2001
+From 8ad87518807a2179ffec01f1ac4851377315839b Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jon-hunter@ti.com>
 Date: Fri, 14 Sep 2012 17:41:57 -0500
-Subject: [PATCH 06/36] dmaengine: add helper function to request a slave DMA
+Subject: [PATCH 05/35] dmaengine: add helper function to request a slave DMA
  channel
 
 Currently slave DMA channels are requested by calling dma_request_channel()

patches/dma/0007-of-Add-generic-device-tree-DMA-helpers.patch → patches/dma/0006-of-Add-generic-device-tree-DMA-helpers.patch

@@ -1,7 +1,7 @@
-From a1b970c3347817e4317aa897abae4ca043697ed8 Mon Sep 17 00:00:00 2001
+From 778fef3c6c488010b1d2ba05cc422a5a349b6446 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jon-hunter@ti.com>
 Date: Fri, 14 Sep 2012 17:41:56 -0500
-Subject: [PATCH 07/36] of: Add generic device tree DMA helpers
+Subject: [PATCH 06/35] of: Add generic device tree DMA helpers
 
 This is based upon the work by Benoit Cousson [1] and Nicolas Ferre [2]
 to add some basic helpers to retrieve a DMA controller device_node and the

patches/dma/0008-of-dma-fix-build-break-for-CONFIG_OF.patch → patches/dma/0007-of-dma-fix-build-break-for-CONFIG_OF.patch

@@ -1,7 +1,7 @@
-From 2a4f02381f6c50a49943600cc5de998caf9616e1 Mon Sep 17 00:00:00 2001
+From 03b6873d193e528fb8c22aaa6c0aee0ed0d63aa7 Mon Sep 17 00:00:00 2001
 From: Vinod Koul <vinod.koul@linux.intel.com>
 Date: Tue, 25 Sep 2012 09:57:36 +0530
-Subject: [PATCH 08/36] of: dma- fix build break for !CONFIG_OF
+Subject: [PATCH 07/35] of: dma- fix build break for !CONFIG_OF
 
 Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
 ---

patches/dma/0009-of-dma-fix-typos-in-generic-dma-binding-definition.patch → patches/dma/0008-of-dma-fix-typos-in-generic-dma-binding-definition.patch

@@ -1,7 +1,7 @@
-From a428e67f7035d4459e0b5ebaf30b24614e2e237f Mon Sep 17 00:00:00 2001
+From 43432be0ba16e3c044411252de4edb4ce054666b Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Wed, 19 Sep 2012 10:49:48 -0400
-Subject: [PATCH 09/36] of: dma: fix typos in generic dma binding definition
+Subject: [PATCH 08/35] of: dma: fix typos in generic dma binding definition
 
 Some semicolons were left out in the examples.
 

patches/dma/0010-dmaengine-fix-build-failure-due-to-missing-semi-colo.patch → patches/dma/0009-dmaengine-fix-build-failure-due-to-missing-semi-colo.patch

@@ -1,7 +1,7 @@
-From 4ed9dff092b80afbe6317b6489b8bd92eb46b1e9 Mon Sep 17 00:00:00 2001
+From be01b5f2ccdb0bfdd5b01ad1fbda0e422d768129 Mon Sep 17 00:00:00 2001
 From: Vinod Koul <vinod.koul@linux.intel.com>
 Date: Tue, 25 Sep 2012 16:18:55 +0530
-Subject: [PATCH 10/36] dmaengine: fix build failure due to missing semi-colon
+Subject: [PATCH 09/35] dmaengine: fix build failure due to missing semi-colon
 
 Reported-by: Fengguang Wu <fengguang.wu@intel.com>
 Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>

patches/dma/0011-dmaengine-edma-fix-slave-config-dependency-on-direct.patch → patches/dma/0010-dmaengine-edma-fix-slave-config-dependency-on-direct.patch

@@ -1,7 +1,7 @@
-From 1c780cd2faa7cf21e3fa073a1e48bf64e398e494 Mon Sep 17 00:00:00 2001
+From 07d0f51466177e528cbb21d7436239561e4191e3 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Tue, 18 Sep 2012 18:57:15 +0000
-Subject: [PATCH 11/36] dmaengine: edma: fix slave config dependency on
+Subject: [PATCH 10/35] dmaengine: edma: fix slave config dependency on
  direction
 
 The edma_slave_config() implementation depends on the

patches/dma/0012-dmaengine-add-dma_get_channel_caps.patch → patches/dma/0011-dmaengine-add-dma_get_channel_caps.patch

@@ -1,7 +1,7 @@
-From 6367409bfd26e6fa9aed9ea42149449f1e7d7f8a Mon Sep 17 00:00:00 2001
+From 666f679c08e4f41faf0891026518e0fc91a2fe5d Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 18 Oct 2012 21:07:28 -0400
-Subject: [PATCH 12/36] dmaengine: add dma_get_channel_caps()
+Subject: [PATCH 11/35] dmaengine: add dma_get_channel_caps()
 
 Add a dmaengine API to retrieve per channel capabilities.
 Currently, only channel ops and SG segment limitations are

patches/dma/0013-dma-edma-add-device_channel_caps-support.patch → patches/dma/0012-dma-edma-add-device_channel_caps-support.patch

@@ -1,7 +1,7 @@
-From 06c113f35ea842a444d2760cb14eb2daf0df5ffd Mon Sep 17 00:00:00 2001
+From 9f8ab54dbe43320aa8feafdbb3021e5ae7da7ff8 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 18 Oct 2012 21:08:59 -0400
-Subject: [PATCH 13/36] dma: edma: add device_channel_caps() support
+Subject: [PATCH 12/35] dma: edma: add device_channel_caps() support
 
 Implement device_channel_caps().
 

patches/dma/0014-mmc-davinci-get-SG-segment-limits-with-dma_get_chann.patch → patches/dma/0013-mmc-davinci-get-SG-segment-limits-with-dma_get_chann.patch

@@ -1,7 +1,7 @@
-From 0e1e3cc5adfd717269bf9d06a80ba3845b64ab19 Mon Sep 17 00:00:00 2001
+From bbd5259b2f6360c2c3fe6c109a4d3f5b7c214a6f Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 18 Oct 2012 21:10:47 -0400
-Subject: [PATCH 14/36] mmc: davinci: get SG segment limits with
+Subject: [PATCH 13/35] mmc: davinci: get SG segment limits with
  dma_get_channel_caps()
 
 Replace the hardcoded values used to set max_segs/max_seg_size with

patches/dma/0015-ARM-davinci-move-private-EDMA-API-to-arm-common.patch → patches/dma/0014-ARM-davinci-move-private-EDMA-API-to-arm-common.patch

@@ -1,7 +1,7 @@
-From b5f9de0d7a8b799f56c425453b8410a416b48231 Mon Sep 17 00:00:00 2001
+From c040bb4c119708cd911e1bb14fd51a4c866ddc73 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Wed, 22 Aug 2012 09:24:24 -0400
-Subject: [PATCH 15/36] ARM: davinci: move private EDMA API to arm/common
+Subject: [PATCH 14/35] ARM: davinci: move private EDMA API to arm/common
 
 Move mach-davinci/dma.c to common/edma.c so it can be used
 by OMAP (specifically AM33xx) as well. This just moves the

patches/dma/0016-ARM-edma-remove-unused-transfer-controller-handlers.patch → patches/dma/0015-ARM-edma-remove-unused-transfer-controller-handlers.patch

@@ -1,7 +1,7 @@
-From 53c7fafd8ec1c31fe22ede37729efd479554d38d Mon Sep 17 00:00:00 2001
+From 6378d208297a90789090ebcf0d2f44b022381400 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Wed, 22 Aug 2012 09:31:49 -0400
-Subject: [PATCH 16/36] ARM: edma: remove unused transfer controller handlers
+Subject: [PATCH 15/35] ARM: edma: remove unused transfer controller handlers
 
 Fix build on OMAP, the irqs are undefined on AM33xx.
 These error interrupt handlers were hardcoded as disabled

patches/dma/0017-ARM-edma-add-AM33XX-support-to-the-private-EDMA-API.patch → patches/dma/0016-ARM-edma-add-AM33XX-support-to-the-private-EDMA-API.patch

@@ -1,7 +1,7 @@
-From 70aa00b67cca62d9d8e768906b75fb24fca4127e Mon Sep 17 00:00:00 2001
+From 70580a2a247b01b054c49e3a2dfd97b038e752ff Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 6 Sep 2012 17:40:42 -0400
-Subject: [PATCH 17/36] ARM: edma: add AM33XX support to the private EDMA API
+Subject: [PATCH 16/35] ARM: edma: add AM33XX support to the private EDMA API
 
 Adds support for parsing the TI EDMA DT data into the required
 EDMA private API platform data. Enables runtime PM support to

patches/dma/0018-dmaengine-edma-enable-build-for-AM33XX.patch → patches/dma/0017-dmaengine-edma-enable-build-for-AM33XX.patch

@@ -1,7 +1,7 @@
-From 8ed0406f23ecd2584d8456b69b95b6483757f133 Mon Sep 17 00:00:00 2001
+From f9dbd93b4c021dfaf32058eb4f6c18ae92489c36 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 6 Sep 2012 17:42:35 -0400
-Subject: [PATCH 18/36] dmaengine: edma: enable build for AM33XX
+Subject: [PATCH 17/35] dmaengine: edma: enable build for AM33XX
 
 Enable TI EDMA option on OMAP.
 

patches/dma/0019-dmaengine-edma-Add-TI-EDMA-device-tree-binding.patch → patches/dma/0018-dmaengine-edma-Add-TI-EDMA-device-tree-binding.patch

@@ -1,7 +1,7 @@
-From 6ce5d62659fe02a30cd2e2acb643ec5dd5105d8c Mon Sep 17 00:00:00 2001
+From ba83f86c6bb18f7babd9330f869331eb87452225 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 20 Sep 2012 07:46:04 -0400
-Subject: [PATCH 19/36] dmaengine: edma: Add TI EDMA device tree binding
+Subject: [PATCH 18/35] dmaengine: edma: Add TI EDMA device tree binding
 
 The binding definition is based on the generic DMA controller
 binding.

patches/dma/0020-ARM-dts-add-AM33XX-EDMA-support.patch → patches/dma/0019-ARM-dts-add-AM33XX-EDMA-support.patch

@@ -1,7 +1,7 @@
-From 4238a1e3177469b79d9ba198dfd07d8ad83743db Mon Sep 17 00:00:00 2001
+From 11eabe54b9cead5354c3fb25f95b1c7fddcf3509 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Wed, 10 Oct 2012 10:01:33 -0400
-Subject: [PATCH 20/36] ARM: dts: add AM33XX EDMA support
+Subject: [PATCH 19/35] ARM: dts: add AM33XX EDMA support
 
 Adds AM33XX EDMA support to the am33xx.dtsi as documented in
 Documentation/devicetree/bindings/dma/ti-edma.txt

patches/dma/0021-dmaengine-add-dma_request_slave_channel_compat.patch → patches/dma/0020-dmaengine-add-dma_request_slave_channel_compat.patch

@@ -1,7 +1,7 @@
-From bd24e1cde3d5c55dc977586b3789f6127cf58e81 Mon Sep 17 00:00:00 2001
+From 062499a0dc01a4ef5362566bde7895861ae3f83f Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 11 Oct 2012 12:58:44 -0400
-Subject: [PATCH 21/36] dmaengine: add dma_request_slave_channel_compat()
+Subject: [PATCH 20/35] dmaengine: add dma_request_slave_channel_compat()
 
 Adds a dma_request_slave_channel_compat() wrapper which accepts
 both the arguments from dma_request_channel() and

patches/dma/0022-mmc-omap_hsmmc-convert-to-dma_request_slave_channel_.patch → patches/dma/0021-mmc-omap_hsmmc-convert-to-dma_request_slave_channel_.patch

@@ -1,7 +1,7 @@
-From 50f4438d9131e1d03662f36a6dc7b3cc445384b1 Mon Sep 17 00:00:00 2001
+From c155885ecbdddffb1335ce3e21ea30063d791ee5 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 6 Sep 2012 17:47:21 -0400
-Subject: [PATCH 22/36] mmc: omap_hsmmc: convert to
+Subject: [PATCH 21/35] mmc: omap_hsmmc: convert to
  dma_request_slave_channel_compat()
 
 Convert dmaengine channel requests to use

patches/dma/0023-mmc-omap_hsmmc-set-max_segs-based-on-dma-engine-limi.patch → patches/dma/0022-mmc-omap_hsmmc-set-max_segs-based-on-dma-engine-limi.patch

@@ -1,7 +1,7 @@
-From b52c0152e20dbb7a639aec73b3309e745a70a0c8 Mon Sep 17 00:00:00 2001
+From 995b5a32f28b2bfbf0ff6d797ef52aa859cb3756 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 20 Sep 2012 08:55:41 -0400
-Subject: [PATCH 23/36] mmc: omap_hsmmc: set max_segs based on dma engine
+Subject: [PATCH 22/35] mmc: omap_hsmmc: set max_segs based on dma engine
  limitations
 
 The EDMA DMAC has a hardware limitation that prevents supporting

patches/dma/0024-mmc-omap_hsmmc-add-generic-DMA-request-support-to-th.patch → patches/dma/0023-mmc-omap_hsmmc-add-generic-DMA-request-support-to-th.patch

@@ -1,7 +1,7 @@
-From 4a1241cf77de422ad850f4ffb5cb2bbfacb2d058 Mon Sep 17 00:00:00 2001
+From dd70c6bfa325e259adaadbf1578c68d030dfb308 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 20 Sep 2012 07:47:47 -0400
-Subject: [PATCH 24/36] mmc: omap_hsmmc: add generic DMA request support to the
+Subject: [PATCH 23/35] mmc: omap_hsmmc: add generic DMA request support to the
  DT binding
 
 The binding definition is based on the generic DMA request binding.

patches/dma/0025-ARM-dts-add-AM33XX-MMC-support.patch → patches/dma/0024-ARM-dts-add-AM33XX-MMC-support.patch

@@ -1,7 +1,7 @@
-From 4d87b8da1a0727523c4545398795f79a80afda0e Mon Sep 17 00:00:00 2001
+From e0ebca204811b8d8facdfeff7c3bac4d4d3d8e82 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Wed, 10 Oct 2012 15:14:03 -0400
-Subject: [PATCH 25/36] ARM: dts: add AM33XX MMC support
+Subject: [PATCH 24/35] ARM: dts: add AM33XX MMC support
 
 Adds AM33XX MMC support for am335x-bone, am335x-evm, and
 am335x-evmsk.

patches/dma/0026-spi-omap2-mcspi-convert-to-dma_request_slave_channel.patch → patches/dma/0025-spi-omap2-mcspi-convert-to-dma_request_slave_channel.patch

@@ -1,7 +1,7 @@
-From 742c935e9476538fc40b2f6feaf733c02e521c5c Mon Sep 17 00:00:00 2001
+From 33700bd2b42f89a57f77594d98c5583ec256d645 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 20 Sep 2012 00:37:54 -0400
-Subject: [PATCH 26/36] spi: omap2-mcspi: convert to
+Subject: [PATCH 25/35] spi: omap2-mcspi: convert to
  dma_request_slave_channel_compat()
 
 Convert dmaengine channel requests to use

patches/dma/0027-spi-omap2-mcspi-add-generic-DMA-request-support-to-t.patch → patches/dma/0026-spi-omap2-mcspi-add-generic-DMA-request-support-to-t.patch

@@ -1,7 +1,7 @@
-From d07b7654eea1b9bceb028c09430dabca70f54624 Mon Sep 17 00:00:00 2001
+From d17ecd5f7df7b8d3fcc36bb3220c3dd48a74983a Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 20 Sep 2012 09:21:16 -0400
-Subject: [PATCH 27/36] spi: omap2-mcspi: add generic DMA request support to
+Subject: [PATCH 26/35] spi: omap2-mcspi: add generic DMA request support to
  the DT binding
 
 The binding definition is based on the generic DMA request binding.

patches/dma/0028-ARM-dts-add-AM33XX-SPI-DMA-support.patch → patches/dma/0027-ARM-dts-add-AM33XX-SPI-DMA-support.patch

@@ -1,7 +1,7 @@
-From 56e3f52c8c63572640ea9965bb5ba480fdf90f7b Mon Sep 17 00:00:00 2001
+From 744dd74e9217824a99bb6b81ef7ef4b86ce46352 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 10 Jan 2013 19:09:50 -0500
-Subject: [PATCH 28/36] ARM: dts: add AM33XX SPI DMA support
+Subject: [PATCH 27/35] ARM: dts: add AM33XX SPI DMA support
 
 Adds DMA resources to the AM33XX SPI nodes.
 

patches/dma/0029-ARM-dts-Add-SPI-Flash-support-to-am335x-evm.patch → patches/dma/0028-ARM-dts-Add-SPI-Flash-support-to-am335x-evm.patch

@@ -1,7 +1,7 @@
-From 6c7a1dc28b7e82e7490523e7801dc8b3ec382473 Mon Sep 17 00:00:00 2001
+From 22126031aa8125ed8dbbe933de1cfe3fae021675 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 10 Jan 2013 19:11:38 -0500
-Subject: [PATCH 29/36] ARM: dts: Add SPI Flash support to am335x-evm
+Subject: [PATCH 28/35] ARM: dts: Add SPI Flash support to am335x-evm
 
 Add SPI pinmuxing and spansion device node for profile 2..
 

patches/dma/0030-Documentation-bindings-add-spansion.patch → patches/dma/0029-Documentation-bindings-add-spansion.patch

@@ -1,7 +1,7 @@
-From e2e685f2482ee01fcb5c7f78214aee47d18e7f46 Mon Sep 17 00:00:00 2001
+From eed5dcb3ad2736626371adade84ab3d472df885d Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Wed, 17 Oct 2012 17:12:09 -0400
-Subject: [PATCH 30/36] Documentation: bindings: add spansion
+Subject: [PATCH 29/35] Documentation: bindings: add spansion
 
 Signed-off-by: Matt Porter <mporter@ti.com>
 ---

patches/dma/0031-ARM-dts-enable-spi1-node-and-pinmux-on-BeagleBone.patch → patches/dma/0030-ARM-dts-enable-spi1-node-and-pinmux-on-BeagleBone.patch

@@ -1,7 +1,7 @@
-From 6cb26b5ddff05a59689166d8470e4435e2890e20 Mon Sep 17 00:00:00 2001
+From 9fe50dc252c4e471209e43fc8fefa98466ef9aba Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 10 Jan 2013 19:13:30 -0500
-Subject: [PATCH 31/36] ARM: dts: enable spi1 node and pinmux on BeagleBone
+Subject: [PATCH 30/35] ARM: dts: enable spi1 node and pinmux on BeagleBone
 
 Enables the spi1 IP and pinmuxes for use on the mcasp0
 pins.

patches/dma/0032-ARM-dts-add-BeagleBone-Adafruit-1.8-LCD-support.patch → patches/dma/0031-ARM-dts-add-BeagleBone-Adafruit-1.8-LCD-support.patch

@@ -1,7 +1,7 @@
-From 43e7060e793052a9937afd1ab381ccc1c78243b6 Mon Sep 17 00:00:00 2001
+From 0b4d673a3e1c225e091b3ddec4f06182af4f27c8 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Thu, 11 Oct 2012 08:52:54 -0400
-Subject: [PATCH 32/36] ARM: dts: add BeagleBone Adafruit 1.8 LCD support
+Subject: [PATCH 31/35] ARM: dts: add BeagleBone Adafruit 1.8 LCD support
 
 Signed-off-by: Matt Porter <mporter@ti.com>
 ---

patches/dma/0033-misc-add-gpevt-driver.patch → patches/dma/0032-misc-add-gpevt-driver.patch

@@ -1,7 +1,7 @@
-From 046772323b360c20ce81cfdc80eaad172ab11f73 Mon Sep 17 00:00:00 2001
+From d84f530d82ec634b8a8d64869208b9ea4bf1f4f3 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Wed, 17 Oct 2012 10:48:22 -0400
-Subject: [PATCH 33/36] misc: add gpevt driver
+Subject: [PATCH 32/35] misc: add gpevt driver
 
 Simply amazing...'nuff said.
 

patches/dma/0034-ARM-dts-add-BeagleBone-gpevt-support.patch → patches/dma/0033-ARM-dts-add-BeagleBone-gpevt-support.patch

@@ -1,7 +1,7 @@
-From cb26928506754d696b5bb38aaff5aedb263cae69 Mon Sep 17 00:00:00 2001
+From b26a7d2ca3597d21854fa1c8b837c28fd21eff44 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Wed, 17 Oct 2012 17:12:45 -0400
-Subject: [PATCH 34/36] ARM: dts: add BeagleBone gpevt support
+Subject: [PATCH 33/35] ARM: dts: add BeagleBone gpevt support
 
 Signed-off-by: Matt Porter <mporter@ti.com>
 ---

patches/dma/0035-ARM-configs-working-dmaengine-configs-for-da8xx-and-.patch → patches/dma/0034-ARM-configs-working-dmaengine-configs-for-da8xx-and-.patch

@@ -1,7 +1,7 @@
-From a88b85651b774c0b13bfca9584f232a23824aebe Mon Sep 17 00:00:00 2001
+From 00cb191b89b155b35674bcfdb3b1b15b15f46099 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Wed, 9 Jan 2013 16:26:38 -0500
-Subject: [PATCH 35/36] ARM: configs: working dmaengine configs for da8xx and
+Subject: [PATCH 34/35] ARM: configs: working dmaengine configs for da8xx and
  am33xx
 
 Signed-off-by: Matt Porter <mporter@ti.com>