Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/blackfin/mach-bf538/include/mach/defBF539.h,
arch/blackfin/mach-bf518/include/mach/defBF51x_base.h and
arch/blackfin/mach-bf527/include/mach/defBF52x_base.h between various
commits from the blackfin tree and commit
b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk
typos") from the trivial tree.
I just used the versions from the blackfin tree for now since they moved
large amounts of code around and deleted the latter 2 files.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpaGQ7RryfIt.pgp
Description: PGP signature
