3.8: cleanup: git am --whitespace=fix is your friend, specially with …

…merging patches into massive patchsets Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
beagleboard · May 14, 2014 · b3f658f · b3f658f
1 parent 7ede6b3
commit b3f658f
Show file tree

Hide file tree

Showing 400 changed files with 1,779 additions and 1,916 deletions.
diff --git a/patches/6lowpan/0001-6lowpan-Refactor-packet-delivery-into-a-function.patch b/patches/6lowpan/0001-6lowpan-Refactor-packet-delivery-into-a-function.patch
@@ -1,4 +1,4 @@
-From 1dbf121118e1a56adebb777c2dd3f4cfade7c154 Mon Sep 17 00:00:00 2001
+From ad13a094dab6342fd89a4ba50fc939698ab8d63d Mon Sep 17 00:00:00 2001
 From: Alan Ott <alan@signal11.us>
 Date: Wed, 16 Jan 2013 19:09:47 +0000
 Subject: [PATCH 01/23] 6lowpan: Refactor packet delivery into a function
@@ -72,5 +72,5 @@ index 76c3d0a..9d39f5b 100644
  	kfree_skb(new);
 
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0002-6lowpan-Handle-uncompressed-IPv6-packets-over-6LoWPA.patch b/patches/6lowpan/0002-6lowpan-Handle-uncompressed-IPv6-packets-over-6LoWPA.patch
@@ -1,4 +1,4 @@
-From e6e9c7b810cea56d2998be564e7d3fdc52b9d79d Mon Sep 17 00:00:00 2001
+From 81fa9936f533635e0385ea356ed4f79a8bfa0470 Mon Sep 17 00:00:00 2001
 From: Alan Ott <alan@signal11.us>
 Date: Wed, 16 Jan 2013 19:09:48 +0000
 Subject: [PATCH 02/23] 6lowpan: Handle uncompressed IPv6 packets over 6LoWPAN
@@ -68,5 +68,5 @@ index 9d39f5b..f62c3b9 100644
 
  	return NET_RX_SUCCESS;
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0003-wpan-whitespace-fix.patch b/patches/6lowpan/0003-wpan-whitespace-fix.patch
@@ -1,4 +1,4 @@
-From 2a14f577082e49bf882cc8ea6dff8cf5edd20ba8 Mon Sep 17 00:00:00 2001
+From 71d4c4dc93ada2cf15a904754238e5d5956adfa0 Mon Sep 17 00:00:00 2001
 From: Alexander Aring <alex.aring@gmail.com>
 Date: Tue, 5 Feb 2013 04:25:35 +0000
 Subject: [PATCH 03/23] wpan: whitespace fix
@@ -23,5 +23,5 @@ index 199b922..98c867b 100644
  	return 0;
  }
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0004-6lowpan-use-stack-buffer-instead-of-heap.patch b/patches/6lowpan/0004-6lowpan-use-stack-buffer-instead-of-heap.patch
@@ -1,4 +1,4 @@
-From 1b0720c87c2b99329fca359ea5bad66fd1c31fcc Mon Sep 17 00:00:00 2001
+From 3a228d9c03dd5485a595e9b7a389a476e320e339 Mon Sep 17 00:00:00 2001
 From: Alexander Aring <alex.aring@gmail.com>
 Date: Tue, 5 Feb 2013 10:23:43 +0000
 Subject: [PATCH 04/23] 6lowpan: use stack buffer instead of heap
@@ -50,5 +50,5 @@ index f62c3b9..43b95ca 100644
  				skb->len);
 
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0005-wpan-use-stack-buffer-instead-of-heap.patch b/patches/6lowpan/0005-wpan-use-stack-buffer-instead-of-heap.patch
@@ -1,4 +1,4 @@
-From 908de1e2e4666bb796cfcde16b22ba5dd56feb94 Mon Sep 17 00:00:00 2001
+From 8105eff067b3ca880dcf94148d6be8eb13e86b6e Mon Sep 17 00:00:00 2001
 From: Alexander Aring <alex.aring@gmail.com>
 Date: Tue, 5 Feb 2013 10:23:44 +0000
 Subject: [PATCH 05/23] wpan: use stack buffer instead of heap
@@ -43,5 +43,5 @@ index 98c867b..d20c6d3 100644
  	return pos;
  }
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0006-mrf24j40-pinctrl-support.patch b/patches/6lowpan/0006-mrf24j40-pinctrl-support.patch
@@ -1,4 +1,4 @@
-From b2f8316cdf1f4ab19f7b113011b598c9f4aaedaa Mon Sep 17 00:00:00 2001
+From da0cc066435a893d263d87366cdc93a468508db3 Mon Sep 17 00:00:00 2001
 From: Alan Ott <alan@signal11.us>
 Date: Mon, 18 Mar 2013 00:39:48 -0400
 Subject: [PATCH 06/23] mrf24j40: pinctrl support
@@ -43,5 +43,5 @@ index 3f2c7aa..3106895 100644
  	if (spi->max_speed_hz > MAX_SPI_SPEED_HZ)
  		spi->max_speed_hz = MAX_SPI_SPEED_HZ;
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0007-mrf24j40-Warn-if-transmit-interrupts-timeout.patch b/patches/6lowpan/0007-mrf24j40-Warn-if-transmit-interrupts-timeout.patch
@@ -1,4 +1,4 @@
-From 70baba79049278bd1779205840084fe3ba20718c Mon Sep 17 00:00:00 2001
+From e715628aaa21947605a5c5b853b792454b1e051a Mon Sep 17 00:00:00 2001
 From: Alan Ott <alan@signal11.us>
 Date: Mon, 18 Mar 2013 00:49:02 -0400
 Subject: [PATCH 07/23] mrf24j40: Warn if transmit interrupts timeout
@@ -23,5 +23,5 @@ index 3106895..bb7e613 100644
  	}
 
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0008-mrf24j40-Increase-max-SPI-speed-to-10MHz.patch b/patches/6lowpan/0008-mrf24j40-Increase-max-SPI-speed-to-10MHz.patch
@@ -1,4 +1,4 @@
-From dcd6826e52d90d2b5406ff657a0a068ed9e36f06 Mon Sep 17 00:00:00 2001
+From e2bf8f31bb8f6bfae74c480f289926fffe30ab79 Mon Sep 17 00:00:00 2001
 From: Alan Ott <alan@signal11.us>
 Date: Mon, 18 Mar 2013 01:17:05 -0400
 Subject: [PATCH 08/23] mrf24j40: Increase max SPI speed to 10MHz
@@ -28,5 +28,5 @@ index bb7e613..f6e723e 100644
  #define printdev(X) (&X->spi->dev)
 
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0009-mrf24j40-Fix-byte-order-of-IEEE-address.patch b/patches/6lowpan/0009-mrf24j40-Fix-byte-order-of-IEEE-address.patch
@@ -1,4 +1,4 @@
-From 9602f99074c98ae2f290b9ff1127932e332f1729 Mon Sep 17 00:00:00 2001
+From 46c3e45c4d6fbb8ce1f7398edfc5b05f96a37a65 Mon Sep 17 00:00:00 2001
 From: Alan Ott <alan@signal11.us>
 Date: Mon, 18 Mar 2013 01:26:01 -0400
 Subject: [PATCH 09/23] mrf24j40: Fix byte-order of IEEE address
@@ -25,5 +25,5 @@ index f6e723e..6481faf 100644
  #ifdef DEBUG
  		printk(KERN_DEBUG "Set long addr to: ");
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0010-6lowpan-lowpan_is_iid_16_bit_compressable-does-not-d.patch b/patches/6lowpan/0010-6lowpan-lowpan_is_iid_16_bit_compressable-does-not-d.patch
@@ -1,4 +1,4 @@
-From 657946b24cb10c9a7e1cc0587be13b6d343dad81 Mon Sep 17 00:00:00 2001
+From 052cf0a60e4cd830e95027a949882c5828a9c5a0 Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:21 -0400
 Subject: [PATCH 10/23] 6lowpan: lowpan_is_iid_16_bit_compressable() does not
@@ -31,5 +31,5 @@ index bba5f83..4b8f917 100644
  /* multicast address */
  #define is_addr_mcast(a) (((a)->s6_addr[0]) == 0xFF)
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0011-6lowpan-next-header-is-not-properly-set-upon-decompr.patch b/patches/6lowpan/0011-6lowpan-next-header-is-not-properly-set-upon-decompr.patch
@@ -1,4 +1,4 @@
-From 48b865cf3e0f27a727bc1f986a5f359ade5b1036 Mon Sep 17 00:00:00 2001
+From 45a4a516404a5a6cc853f75db43255467993dee9 Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:22 -0400
 Subject: [PATCH 11/23] 6lowpan: next header is not properly set upon
@@ -29,5 +29,5 @@ index 43b95ca..9f53904 100644
  	/* Not fragmented package */
  	hdr.payload_len = htons(skb->len);
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0012-6lowpan-always-enable-link-layer-acknowledgments.patch b/patches/6lowpan/0012-6lowpan-always-enable-link-layer-acknowledgments.patch
@@ -1,4 +1,4 @@
-From 0b12c64bcd6e70430d68e14021266323e5ed388f Mon Sep 17 00:00:00 2001
+From a7cac194490f2ab41af4eceaf6c36c3087148f8a Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:23 -0400
 Subject: [PATCH 12/23] 6lowpan: always enable link-layer acknowledgments
@@ -30,5 +30,5 @@ index 9f53904..e7f61de 100644
  				type, (void *)&da, (void *)&sa, skb->len);
  	}
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0013-mac802154-turn-on-ACK-when-enabled-by-the-upper-laye.patch b/patches/6lowpan/0013-mac802154-turn-on-ACK-when-enabled-by-the-upper-laye.patch
@@ -1,4 +1,4 @@
-From 4f5c20a903d375a41f860d992ac4ce3fb83f8b38 Mon Sep 17 00:00:00 2001
+From 5e0a3705115a1c62a1be2d663bf9de3d29c11bbb Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:24 -0400
 Subject: [PATCH 13/23] mac802154: turn on ACK when enabled by the upper
@@ -23,5 +23,5 @@ index d20c6d3..7d3f659 100644
  	if (!saddr) {
  		spin_lock_bh(&priv->mib_lock);
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0014-6lowpan-use-short-IEEE-802.15.4-addresses-for-broadc.patch b/patches/6lowpan/0014-6lowpan-use-short-IEEE-802.15.4-addresses-for-broadc.patch
@@ -1,4 +1,4 @@
-From 511582a7602be3ef8a10aec5f6e506a6c205dee3 Mon Sep 17 00:00:00 2001
+From 8299397506589dbaf79b2374061777b6f018ea6c Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:25 -0400
 Subject: [PATCH 14/23] 6lowpan: use short IEEE 802.15.4 addresses for
@@ -54,5 +54,5 @@ index e7f61de..0eebb96 100644
  		return dev_hard_header(skb, lowpan_dev_info(dev)->real_dev,
  				type, (void *)&da, (void *)&sa, skb->len);
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0015-6lowpan-fix-first-fragment-FRAG1-handling.patch b/patches/6lowpan/0015-6lowpan-fix-first-fragment-FRAG1-handling.patch
@@ -1,4 +1,4 @@
-From 158dc176c1180b83fc167e7f3ccc01b7f5190b7d Mon Sep 17 00:00:00 2001
+From 1b60dec35b671c2362e4a5d418bf8a6779180d37 Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:26 -0400
 Subject: [PATCH 15/23] 6lowpan: fix first fragment (FRAG1) handling
@@ -119,5 +119,5 @@ index 0eebb96..4a62289 100644
  }
 
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0016-6lowpan-add-debug-messages-for-6LoWPAN-fragmentation.patch b/patches/6lowpan/0016-6lowpan-add-debug-messages-for-6LoWPAN-fragmentation.patch
@@ -1,4 +1,4 @@
-From 047e36b984290479c93bbef4de857886e53cdbe8 Mon Sep 17 00:00:00 2001
+From 69f577e1787883d75fef569b2f216def5eb98678 Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:27 -0400
 Subject: [PATCH 16/23] 6lowpan: add debug messages for 6LoWPAN fragmentation
@@ -80,5 +80,5 @@ index 4a62289..61eee9d 100644
  		offset += len;
  	}
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0017-6lowpan-store-fragment-tag-values-per-device-instead.patch b/patches/6lowpan/0017-6lowpan-store-fragment-tag-values-per-device-instead.patch
@@ -1,4 +1,4 @@
-From 782e99a904a568d7b3c49dd5bc71e3d830448166 Mon Sep 17 00:00:00 2001
+From 04d25171e235ed42ed6ac9e30e063f11da53afda Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:28 -0400
 Subject: [PATCH 17/23] 6lowpan: store fragment tag values per device instead
@@ -64,5 +64,5 @@ index 61eee9d..f952451 100644
 
  	entry = kzalloc(sizeof(struct lowpan_dev_record), GFP_KERNEL);
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0018-mac802154-add-mac802154_dev_get_dsn.patch b/patches/6lowpan/0018-mac802154-add-mac802154_dev_get_dsn.patch
@@ -1,4 +1,4 @@
-From d858c4bb462f22d8fa98930bb16622c85d5ea622 Mon Sep 17 00:00:00 2001
+From 8f02ab1b9ddcf94a2f1f475c4979f2b57bf9144f Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:29 -0400
 Subject: [PATCH 18/23] mac802154: add mac802154_dev_get_dsn()
@@ -57,5 +57,5 @@ index f47781a..f03e55f 100644
  {
  	struct phy_chan_notify_work *nw = container_of(work,
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0019-6lowpan-obtain-IEEE802.15.4-sequence-number-from-the.patch b/patches/6lowpan/0019-6lowpan-obtain-IEEE802.15.4-sequence-number-from-the.patch
@@ -1,4 +1,4 @@
-From ac2bae8972ff640901fa724e5d235a7bef40c3c1 Mon Sep 17 00:00:00 2001
+From 134666562ad43bb53034e03ab8c8b295099f4c33 Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:30 -0400
 Subject: [PATCH 19/23] 6lowpan: obtain IEEE802.15.4 sequence number from the
@@ -46,5 +46,5 @@ index f952451..d1d4ee6 100644
 
  static void lowpan_setup(struct net_device *dev)
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0020-6lowpan-use-the-PANID-provided-by-the-device-instead.patch b/patches/6lowpan/0020-6lowpan-use-the-PANID-provided-by-the-device-instead.patch
@@ -1,4 +1,4 @@
-From 6f2b7cfc845d1fe460a7daefd3b7b126d6f74499 Mon Sep 17 00:00:00 2001
+From 2a484e0d04c3911d75667aaa0f5a8139f5d63e0d Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:31 -0400
 Subject: [PATCH 20/23] 6lowpan: use the PANID provided by the device instead
@@ -29,5 +29,5 @@ index d1d4ee6..276971b 100644
  		 * if the destination address is the broadcast address, use the
  		 * corresponding short address
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0021-6lowpan-modify-udp-compression-uncompression-to-matc.patch b/patches/6lowpan/0021-6lowpan-modify-udp-compression-uncompression-to-matc.patch
@@ -1,4 +1,4 @@
-From 0bbaca582b73bab4e9720429b5d80962dcde0cdc Mon Sep 17 00:00:00 2001
+From 3e4863fee936d4aae483d17fc71be03e91332682 Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:32 -0400
 Subject: [PATCH 21/23] 6lowpan: modify udp compression/uncompression to match
@@ -86,5 +86,5 @@ index 276971b..c9c3f3d 100644
  	}
 
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0022-6lowpan-fix-a-small-formatting-issue.patch b/patches/6lowpan/0022-6lowpan-fix-a-small-formatting-issue.patch
@@ -1,4 +1,4 @@
-From 451b591d790eef308ef7eade2559a5e437963c30 Mon Sep 17 00:00:00 2001
+From b3ed6bd5b306a77fc3a68336646481cf6c865773 Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Wed, 27 Mar 2013 00:09:24 -0400
 Subject: [PATCH 22/23] 6lowpan: fix a small formatting issue
@@ -25,5 +25,5 @@ index c9c3f3d..f4969d7 100644
 
  struct lowpan_dev_record {
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/6lowpan/0023-6lowpan-use-IEEE802154_ADDR_LEN-instead-of-a-magic-n.patch b/patches/6lowpan/0023-6lowpan-use-IEEE802154_ADDR_LEN-instead-of-a-magic-n.patch
@@ -1,4 +1,4 @@
-From 1fe5097051670621693aac4ddb103da328e0917b Mon Sep 17 00:00:00 2001
+From 7a0cfb5c53193391774be7e4c1b8b259ab299481 Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Wed, 27 Mar 2013 00:09:25 -0400
 Subject: [PATCH 23/23] 6lowpan: use IEEE802154_ADDR_LEN instead of a magic
@@ -23,5 +23,5 @@ index f4969d7..e1b4580 100644
  			/* request acknowledgment */
  			mac_cb(skb)->flags |= MAC_CB_FLAG_ACKREQ;
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/PG2/0001-beaglebone-black-1ghz-hack.patch b/patches/PG2/0001-beaglebone-black-1ghz-hack.patch
@@ -10,13 +10,14 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
-index 5434bfd..1abf267 100644
+index 897c2a3..eec37a4 100644
 --- a/arch/arm/boot/dts/am335x-boneblack.dts
 +++ b/arch/arm/boot/dts/am335x-boneblack.dts
-@@ -43,3 +43,19 @@
+@@ -42,3 +42,19 @@
+ 	ti,non-removable;
  	status = "okay";
  };
- 
++
 +
 +&cpu {
 +	/*
@@ -32,7 +33,6 @@ index 5434bfd..1abf267 100644
 +		300000   969000
 +	>;
 +};
-+
 diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
 index 6b71632..6c24c9b 100644
 --- a/arch/arm/boot/dts/am33xx.dtsi
@@ -47,5 +47,5 @@ index 6b71632..6c24c9b 100644
 
  			/*
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/adc/0001-mfd-input-iio-ti_am335x_adc-use-one-structure-for-ti.patch b/patches/adc/0001-mfd-input-iio-ti_am335x_adc-use-one-structure-for-ti.patch
@@ -1,7 +1,7 @@
-From 1d03c900ef504f70b9c8f28e050e1adab90ed753 Mon Sep 17 00:00:00 2001
+From 327b8ddc0d1fad5e233e1318e00a113996bf92e5 Mon Sep 17 00:00:00 2001
 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
 Date: Wed, 12 Jun 2013 18:58:02 +0200
-Subject: [PATCH 01/21] mfd: input: iio: ti_am335x_adc: use one structure for
+Subject: [PATCH 01/20] mfd: input: iio: ti_am335x_adc: use one structure for
  ti_tscadc_dev
 
 The mfd driver creates platform data for the child devices and it is the
@@ -136,5 +136,5 @@ index c79ad5d..8114e4e 100644
 +
  #endif
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/adc/0002-input-ti_am33x_tsc-Step-enable-bits-made-configurabl.patch b/patches/adc/0002-input-ti_am33x_tsc-Step-enable-bits-made-configurabl.patch
@@ -1,7 +1,7 @@
-From 3a09da27c8e1ab187d58f994058eb662c22358b6 Mon Sep 17 00:00:00 2001
+From b205d74ad1744b28aee948bb0237aca8866d9abd Mon Sep 17 00:00:00 2001
 From: "Patil, Rachna" <rachna@ti.com>
 Date: Wed, 12 Jun 2013 18:58:03 +0200
-Subject: [PATCH 02/21] input: ti_am33x_tsc: Step enable bits made
+Subject: [PATCH 02/20] input: ti_am33x_tsc: Step enable bits made
  configurable
 
 Current code has hard coded value written to
@@ -216,5 +216,5 @@ index 8114e4e..4258627 100644
 +
  #endif
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/adc/0003-input-ti_am33x_tsc-Order-of-TSC-wires-made-configura.patch b/patches/adc/0003-input-ti_am33x_tsc-Order-of-TSC-wires-made-configura.patch
@@ -1,7 +1,7 @@
-From 38ac4835f49e91eb19e70067b7606bf6b6bc76db Mon Sep 17 00:00:00 2001
+From caac4bb17f5b1906f8c4218db94dd07349bafb89 Mon Sep 17 00:00:00 2001
 From: "Patil, Rachna" <rachna@ti.com>
 Date: Wed, 12 Jun 2013 18:58:04 +0200
-Subject: [PATCH 03/21] input: ti_am33x_tsc: Order of TSC wires, made
+Subject: [PATCH 03/20] input: ti_am33x_tsc: Order of TSC wires, made
  configurable
 
 The current driver expected touchscreen input
@@ -258,5 +258,5 @@ index 4258627..e36ae41 100644
  #define STEPCHARGE_RFM(val)	((val) << 23)
  #define STEPCHARGE_RFM_XNUR	STEPCHARGE_RFM(1)
 -- 
-1.7.9.5
+1.7.10.4
 
diff --git a/patches/adc/0004-input-ti_am33x_tsc-remove-unwanted-fifo-flush.patch b/patches/adc/0004-input-ti_am33x_tsc-remove-unwanted-fifo-flush.patch
@@ -1,7 +1,7 @@
-From 1c00e3ff030b6b1a4cfbce5fbdfb706369ae77ab Mon Sep 17 00:00:00 2001
+From 90e10a3241c8599d9ae441845bf70f16f2513252 Mon Sep 17 00:00:00 2001
 From: "Patil, Rachna" <rachna@ti.com>
 Date: Wed, 12 Jun 2013 18:58:05 +0200
-Subject: [PATCH 04/21] input: ti_am33x_tsc: remove unwanted fifo flush
+Subject: [PATCH 04/20] input: ti_am33x_tsc: remove unwanted fifo flush
 
 When touchscreen and ADC are used together, this
 unwanted fifo flush leads to loss of ADC data.
@@ -42,5 +42,5 @@ index 2bdd66c..7b7de60 100644
  			/*
  			 * Calculate pressure using formula
 -- 
-1.7.9.5
+1.7.10.4