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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 10 Nov 2010 13:24:20 +1100

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/bcm/Bcmchar.c between commit
eccbf04a904fc99c54ab37c29a2a4dedcec66e33 ("Staging: bcm: use get_user()
to access user pointers") from the staging.current tree and commit
ada692b09f4707a8e06b087b1546d9f5b3f2d37d ("beceem: fix character device
ioctl") from the staging tree.

I just assumed that the latter supercedes the former and so used the
staging version of the file.  I may well be wrong in this.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/