On Wed, Jul 20, 2011 at 06:00:41PM +1000, Stephen Rothwell wrote:> The regmap tree lost its conflict.What was the conflict, OOI? I didn't notice anything.