On Mon, Mar 17, 2014 at 06:34:19PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> arch/sh/Kconfig between commit fbfa893458ed ("sh: Remove Kconfig entries
> for TMU, CMT and MTU2") from the tip tree and commit f6723b569a67 ("usb:
> host: remove selects of USB_ARCH_HAS_?HCI") from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
