Messages in this thread | | | Date | Fri, 16 Mar 2012 12:58:02 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the wireless-next tree with the net-next tree |
| |
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in drivers/net/wireless/ath/ath9k/hw.c between commit 23677ce3172f ("drivers/net: Remove boolean comparisons to true/false") from the net-next tree and commit caed6579c2f9 ("ath9k_hw: Cleanup FastChannelChange") from the wireless-next tree.
The latter commit included the fix from the former, so I just used the latter. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |