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.
cheers,
-roger
[*]
commit 71f4b9cdfccfb82cff702fe61f4ace97a1dfb0e0
Author: Jingoo Han <jg1....@samsung.com>
Date: Wed Feb 20 18:29:30 2013 +0900
mfd: omap-usb-host: Use devm_gpio_request_one()
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
