Messages in this thread | | | Date | Mon, 11 Apr 2011 13:28:44 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the trivial tree with the wireless tree |
| |
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in drivers/net/wireless/ath/ath9k/phy.h between commit a9b6b2569cf1 ("ath9k_hw: turn a few big macros into functions") from the wireless tree and commit 6eab04a87677 ("treewide: remove extra semicolons") from the trivial tree.
The former commit removed the code that the latter changed, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |