+++ /dev/null
-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
-