Hi Eric, Today's linux-next merge of the pxa tree got a lot of conflicts against the arm tree. Unfortunately, I don't have time today to resolve them, so you should probably rebase your tree on the arm tree (or merge the arm tree into yours) and resolve the conflicts. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpqiofk2BLTO.pgp
Description: PGP signature