On Fri, May 11, 2012 at 11:55:14PM -0700, Olof Johansson wrote: > Please double-check that my conflict resolution in for-next was done right. > Thanks Olof. It looks all good. -- Regards, Shawn