On Fri, Aug 31, 2012 at 05:26:22PM -0700, Tony Lindgren wrote: > As the plat and mach includes need to disappear for single zImage work, > we need to remove plat/hardware.h. Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> There's a topic/omap branch in ASoC which you can pull in to help reduce conflicts, or I could merge this there if that's sensible. -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html