On Wed, 2009-06-03 at 10:07 +0200, Jiri Kosina wrote:
> On Wed, 3 Jun 2009, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the trivial tree got a conflict in 
> > Documentation/rfkill.txt between commit 
> > c6d660ce29295d344fcdc3654274b4a0aad1a9c8 ("rfkill: rewrite") from the 
> > wireless tree and commit 9976d9daf91d146724ad9c336f74c60d2195c386 
> > ("trivial: Miscellaneous documentation typo fixes") from the trivial 
> > tree.
> > I just used the version from the wireless tree since it has been
> > basically rewritten there (except I applied the "transmiter" to
> > "transmitter" fix - see below).  Maybe the part of the trivial tree patch
> > that affects this file should be dropped.
> 
> Hi,
> 
> thanks for letting me know. I have dropped the Documentation/rfkill.txt 
> hunk completely. 
> 
> Wireless guys, will you please apply the transmiter -> transmitter fix to 
> your tree?

Will do.

johannes