Messages in this thread | | | Date | Wed, 27 Apr 2011 11:43:09 +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/rtlwifi/pci.c between commit c7cfe38ee0f9 ("rtlwifi: Convert pci routines for addition of rtl8192se and rtl8192de") from the wireless tree and commit 6eab04a87677 ("treewide: remove extra semicolons") from the trivial tree.
The former removed the code that the latter fixed. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |