Messages in this thread | | | Date | Tue, 9 Feb 2010 11:07:10 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the microblaze tree with Linus' tree |
| |
Hi Michal,
Today's linux-next merge of the microblaze tree got a conflict in arch/microblaze/kernel/setup.c between commit a6013411118a6c8c34f1bd8b047b36fdf9711590 ("microblaze: Invalidate dcache before enabling it") from Linus' tree and commit 578059c56c816db2b696a196d3656afc187c7edd ("microblaze: Move cache function to cache.c") from the microblaze tree.
The microblaze tree version supercedes the version from Linus' tree, so I used that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |