Re: [PATCH 0/6] mfd: omap-usb-host: Device tree support for 3.10
From: Samuel Ortiz
Date: Tue Apr 09 2013 - 05:00:45 EST
On Tue, Apr 09, 2013 at 11:39:16AM +0300, Roger Quadros wrote:
> Samuel,
>
> You had the conflicts because a patch [*] was introduced and is not
> required since the reset logic is being removed from the driver.
>
> Anyways, I've rebased the 2 patches on top of mfd-next, so now it
> shouldn't matter.
Both patches applied, thanks a lot.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/