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

[Jiri Kosina]

On Tue, 17 Nov 2009, Stephen Rothwell wrote:

> Today's linux-next merge of the trivial tree got a conflict in
> drivers/net/wireless/rt2x00/rt2800usb.h between various commits from the
> wireless tree and commit 17530b1c635dfd1f258afc6b07b986b425d66ebd
> ("tree-wide: fix assorted typos all over the place") from the trivial
> tree.
> 
> The wireless tree commits moved the code fixed by the trivial tree, but
> also fixed it along the way, so I have ignored the trivial fixup for this
> file.

Thanks for letting me know, I have dropped the rt2800usb bits from my 
queue, so this conflict should now be gone.

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