Patch "linux-next: manual merge of the staging tree with the usb tree" has been added to the 3.3-stable tree

[<gregkh@xxxxxxxxxxxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    linux-next: manual merge of the staging tree with the usb tree

to the 3.3-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch
and it can be found in the queue-3.3 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.


>From sfr@xxxxxxxxxxxxxxxx  Mon Apr 23 09:25:57 2012
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
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@xxxxxxxxx>
Cc: linux-next@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, Masanari Iida <standby24x7@xxxxxxxxx>
Message-ID: <20120423151146.8c5687c65c4eab16f063954c@xxxxxxxxxxxxxxxx>


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@xxxxxxxxxxxxxxxx




Patches currently in stable-queue which might be from sfr@xxxxxxxxxxxxxxxx are

queue-3.3/linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch
--
To unsubscribe from this list: send the line "unsubscribe stable-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html