Messages in this thread | | | Date | Mon, 6 Dec 2010 20:43:10 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the usb tree with the sh tree |
| |
On Mon, Dec 06, 2010 at 12:47:23PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > arch/sh/Kconfig between commit f020c92de48246510623162fb22d60d91810cc56 > ("sh: Enable optional gpiolib for all CPUs with pinmux tables") from the > sh tree and commit e3e9887ee9de36d8e2bef972ad74a42abd7a44c4 ("sh: Convert > to USB_ARCH_HAS_OHCI/EHCI selects") from the usb tree. > > Just context changes. I fixed ti up (see below) and can carry the fix as > necessary.
Looks good, thanks for carrying this.
greg k-h
| |