lkml.org 
[lkml]   [2010]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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]
\
 
 \ /
  Last update: 2010-02-09 01:09    [W:0.032 / U:2.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site