]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
delete 3.3 patch that wasn't a patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Apr 2012 16:37:14 +0000 (09:37 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Apr 2012 16:37:14 +0000 (09:37 -0700)
queue-3.3/linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch [deleted file]
queue-3.3/series

diff --git a/queue-3.3/linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch b/queue-3.3/linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch
deleted file mode 100644 (file)
index 0968689..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-From sfr@canb.auug.org.au  Mon Apr 23 09:25:57 2012
-From: Stephen Rothwell <sfr@canb.auug.org.au>
-Date: Mon, 23 Apr 2012 15:11:46 +1000
-Subject: linux-next: manual merge of the staging tree with the usb tree
-To: Greg KH <greg@kroah.com>
-Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Masanari Iida <standby24x7@gmail.com>
-Message-ID: <20120423151146.8c5687c65c4eab16f063954c@canb.auug.org.au>
-
-
-Hi Greg,\r
-\r
-Today's linux-next merge of the staging tree got a conflict in\r
-drivers/staging/comedi/drivers/dt9812.c between commit de15fe3ed9c3\r
-("USB: dt9812.c: remove err() usage") from the usb tree and commit\r
-73e2918990c0 ("staging: Fix typo in multiple files") from the staging\r
-tree.\r
-\r
-The former supercedes the latter, so I used that.\r
--- \r
-Cheers,\r
-Stephen Rothwell                    sfr@canb.auug.org.au\r
-\r
-
index d884e466b11aadb9ca7e3693225038eb76a0b498..4c03d30eab1321166a96f0980e1e6f4ecd86023b 100644 (file)
@@ -1,2 +1 @@
 perf-fix-build-breakage.patch
-linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch