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

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/p54/p54common.c between commit
0ca1b08eba627b4245efd0f71b55a062bf163777 ("Revert "p54: Use SKB list
handling helpers instead of by-hand code."") from the net-current tree
and commit 373234a7c69600397aea39c1452806736df2dfc5 ("p54: Modify p54
files for new organization") from the wireless tree.

For today, I just ignored the net-current change.  This will need fixing.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature