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

[Greg KH]

On Sat, Jul 16, 2011 at 11:03:58PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/tm6000/tm6000-alsa.c between commit 58d73afffaac
> ("[media] tm6000: remove a check for NO_PCM_LOCK") from the v4l-dvb tree
> and commit d684aee316ec ("tm6000: Cleaned up code style in
> tm6000-alsa.c") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

That fix looks fine, thanks for doing it.

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/