On Thu, Dec 6, 2012 at 11:23 PM, Steven J. Hill <sjhill@xxxxxxxx> wrote: > From: "Steven J. Hill" <sjhill@xxxxxxxx> > > Some MIPS controllers have hardware I/O coherency. This patch > detects those and turns off software coherency. A new kernel > command line option also allows the user to manually turn > software coherency on or off. > > Signed-off-by: Steven J. Hill <sjhill@xxxxxxxx> This patch conflicts with commit b5b64f2ba4 "MIPS: Move processing of coherency kernel parameters earlier" in the linux-next tree. Shane McDonald