Hi John, On Tue, 8 Jul 2008 16:30:44 -0400 "John W. Linville" <linville@xxxxxxxxxxxxx> wrote: > > I just sent a pull request for Dave that will result in a merge > conflict in linux-next. I have a sample merge available here: > > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test > > Just a heads-up... :-) > > John > > P.S. These are one-liners (including the one from yesterday). > Nevertheless, it can't hurt to provide a reference "just in > case"... :-) Appreciated, thanks. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpNtm8RMItWt.pgp
Description: PGP signature
