Messages in this thread | | | Date | Tue, 4 Oct 2011 17:46:42 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the moduleh tree with the wireless tree |
| |
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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |