Subject: linux-next: manual merge of the staging tree with the trivial tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 21 Jun 2011 15:10:27 +1000

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/usbip/userspace/src/utils.h between commit e44ba033c565
("treewide: remove duplicate includes") from the trivial tree and commit
4cbab52d18fc ("staging: usbip: userspace: move header includes out
utils.h") from the staging tree.

The latter supercedes the former, so I used it.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/