Hi Jiri, On Thu, 10 Dec 2009 09:45:27 +0100 (CET) Jiri Kosina <jkosina@xxxxxxx> wrote: > > Linus has merged trivial tree into his tree tonight, so I am afraid that > davem will have to fix the conflict when pulling Linus tree into > net-current. Yep, or Linus can fix it if he feels inclined. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpJiHEj7IWqf.pgp
Description: PGP signature
