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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 8 Apr 2011 16:00:03 +1000

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/ath6kl/os/linux/ar6000_android.c between commit
25985edcedea ("Fix common misspellings") from Linus' tree and commit
8efba264d45d ("ath6kl: kill Android specific code") from the staging tree.

The latter removed the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/