build failure: linux-next: ARM defconfig: u8500

[Linus Walleij]

On Wed, May 29, 2013 at 1:46 AM, Kevin Hilman <khilman at linaro.org> wrote:
> On Tue, May 28, 2013 at 3:57 PM, Kevin Hilman <khilman at linaro.org> wrote:
>
>> u8500_defconfig started failing to build in linux next (next-20130527)
>> but was previously building (next-20130523.)
>
> My apologies, it appears this one is already fixed in next-20130528.
> /me updates automated build to not be a full day behind linux-next.

My fault for screwing it up one day though. :-/

This was beacuse of a double conflict in this file, and
me missing to fix the second conflict...

Linus