[lkml]   [2012]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: 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

 \ /
  Last update: 2012-04-23 16:27    [W:0.051 / U:13.448 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site