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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 9 Jul 2010 11:51:19 +1000

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/wl12xx/wl1271_cmd.h between commit
ba2d3587912f82d1ab4367975b1df460db60fb1e ("drivers/net: use __packed
annotation") from the net tree and commit
34dd2aaac4a4b908c093980a9894fd878aeb6deb ("wl1271: moved scan operations
to a separate file") from the wireless tree.

I didn't bother changing __attribute((packed)) to __packed where this
code has been moved to.  Maybe someone could write a patch to do that ...
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/