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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 10 May 2010 11:27:29 +1000

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/ath/ar9170/main.c between commit
984b3f5746ed2cde3d184651dabf26980f2b66e5 ("bitops: rename for_each_bit()
to for_each_set_bit()") from Linus' tree and commit
f3926b49b7122f66f8f2a1da4ae3275b112ab3e7 ("ar9170usb: remove deprecated
aggregation code") from the wireless tree.

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