Subject: linux-next: manual merge of the wireless tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 3 Jul 2008 14:43:08 +1000

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
6afe6828b19b4567768264831d101026cb5510ff ("iwlwifi: drop skb silently for
Tx request in monitor mode") from the wireless-current tree and commit
914233d68f07d5d9c22630cd5a84fdfd98f39da2 ("iwlwifi: enable packet
injection for iwl3945") from the wireless tree.

I used the version from you test merge, thanks again.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/