Re: linux-next: manual merge of the trivial tree with the wirelesstree

[Jiri Kosina]

On Wed, 27 Apr 2011, Stephen Rothwell wrote:

> 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.

OK, I have reverted that particular hunk.

Thanks for reporting,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/