lkml.org 
[lkml]   [2010]   [Apr]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the staging-next tree with the pcmcia tree
On Wed, Apr 28, 2010 at 04:07:41PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/comedi/drivers/cb_das16_cs.c between commitc
> 8bf6e66c254bba7d0ea3f5d02420776dceac657 ("") from the pcmcia tree and
> commit 6ea17dd43c1153f99920e66f806d86f4e83583cc ("Staging: comedi:
> cb_das16_cs: fixed multiple brace coding style issues") from the
> staging-next tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

Looks great, thanks,

greg k-h


\
 
 \ /
  Last update: 2010-04-28 17:53    [W:0.023 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site