Hi Jiri, On Thu, 5 Feb 2009 13:59:40 +0100 (CET) Jiri Kosina <jkosina@xxxxxxx> wrote: > > Thanks. As the libata patch is apparently now in Linus' tree, I have now > resolved this conflict in my tree, so you should be able to drop this > fixup in the next round of linux-next merging. Thanks. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpRlQf9Z9cTY.pgp
Description: PGP signature
