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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 12 May 2011 11:42:23 +1000

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
net/mac80211/sta_info.h between commit 25985edcedea ("Fix common
misspellings") from Linus' tree and commit 9c3990aaec0a ("nl80211: Let
userspace drive the peer link management states") from the wireless tree.

The latter removed the code updated by the former.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/