On Sun, Jul 12, 2015 at 2:22 PM, Lauren Post <Lauren.Post at freescale.com> wrote: > I removed since they no longer applied to the 3.14.38 version kernel we are releasing. It is very simple to resolve the conflict. Please don't leave it out as this commit clearly fixes a bug.