Messages in this thread | | | Date | Tue, 27 Sep 2011 07:18:54 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the v4l-dvb tree |
| |
On Tue, Sep 27, 2011 at 04:10:55PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/misc/altera-stapl/altera.c between commit cff4fa8415a3 ("[media] > altera-stapl: it is time to move out from staging") from the v4l-dvb tree > and commit 99c978529a40 ("staging: Add module.h to drivers/staging > users") from the staging tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Looks fine, thanks.
greg k-h
| |