[lkml]   [2011]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the staging tree with the v4l-dvb tree
On Fri, Mar 04, 2011 at 04:38:56PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/dabusb/dabusb.c and drivers/staging/dabusb/dabusb.h
> between commit f8f4a7f5c1219571acf55f3889138b594e5b3b68 ("[media] dabusb:
> remove obsolete driver") from the v4l-dvb tree and commit
> 868788278eaa5b841ec1a810b41e156f5fba0ab5 ("Staging: dabusb: fixed coding
> style issues") from the staging tree.
> I removed the files.

That sounds correct, thanks.

greg k-h

 \ /
  Last update: 2011-03-06 12:31    [W:0.036 / U:0.532 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site