Messages in this thread | | | Date | Mon, 23 Apr 2012 07:24:39 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the modem-shm tree with the driver-core tree |
| |
On Mon, Apr 23, 2012 at 03:44:20PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the modem-shm tree got a conflict in > drivers/Kconfig between commit de55d8716ac5 ("Extcon (external > connector): import Android's switch class and modify") from the > driver-core tree and commit 021fd6178bcd ("modem_shm: Makefile and > Kconfig for M7400 Shared Memory Drivers") from the modem-shm tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Looks good, thanks for doing this.
greg k-h
| |