Re: linux-next: manual merge of the staging tree with the trivialtree

[Greg KH]

On Fri, Jun 29, 2012 at 03:57:24PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/comedi/drivers/s626.h between commit 6ac7d11527a3
> ("treewide: Put a space between #include and FILE") from the trivial tree
> and commit 90fd56af25b7 ("staging: comedi: s626: remove private INLINE
> macro") from the staging tree.
> 
> Just context changes.  I fixed it up and can carry the fix as necessary.

Sounds fine with me, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/