linux-next: manual merge of the moduleh tree with the wireless tree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/net/wireless/ath/ath6kl/init.c between commit c6efe578fc5d
("wireless/ath6kl: use of module_param requires the inclusion of
moduleparam.h") from the wireless tree and the same patch as a merge fix
for the moduleh tree.

I dropped the moduleh tree merge fix.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature