From 117d0122431867dab88d5c52a61bd2ecf6e2a2b0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Apr 2012 09:37:14 -0700 Subject: [PATCH] delete 3.3 patch that wasn't a patch --- ...f-the-staging-tree-with-the-usb-tree.patch | 23 ------------------- queue-3.3/series | 1 - 2 files changed, 24 deletions(-) delete mode 100644 queue-3.3/linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch 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 index 096868996bf..00000000000 --- a/queue-3.3/linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch +++ /dev/null @@ -1,23 +0,0 @@ -From sfr@canb.auug.org.au Mon Apr 23 09:25:57 2012 -From: Stephen Rothwell -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 -Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Masanari Iida -Message-ID: <20120423151146.8c5687c65c4eab16f063954c@canb.auug.org.au> - - -Hi Greg, - -Today's linux-next merge of the staging tree got a conflict in -drivers/staging/comedi/drivers/dt9812.c between commit de15fe3ed9c3 -("USB: dt9812.c: remove err() usage") from the usb tree and commit -73e2918990c0 ("staging: Fix typo in multiple files") from the staging -tree. - -The former supercedes the latter, so I used that. --- -Cheers, -Stephen Rothwell sfr@canb.auug.org.au - - diff --git a/queue-3.3/series b/queue-3.3/series index d884e466b11..4c03d30eab1 100644 --- a/queue-3.3/series +++ b/queue-3.3/series @@ -1,2 +1 @@ perf-fix-build-breakage.patch -linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch -- 2.47.3