Hi Michal, Today's linux-next merge of the xilinx tree got conflicts in several files.
These conflicts are caused by a set of old patches in the xilinx tree other copies of which have been merged upstream a while ago. I fact the xilinx tree currently adds no changes to linux-next at all. Could you please clean up this tree? -- Cheers, Stephen Rothwell s...@canb.auug.org.au
pgpRLMaN1tEC4.pgp
Description: PGP signature
