Messages in this thread | | | Date | Wed, 28 Apr 2010 08:25:58 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging-next tree with the staging.current tree |
| |
On Wed, Apr 28, 2010 at 04:08:03PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging-next tree got a conflict in > drivers/staging/dt3155/dt3155_drv.c between commit > 19ba984dd7d8dcf67cebc2ba55abbe454e318fb3 ("Staging: dt3155: fix 50Hz > configuration") from the staging.current tree and commit > da7bcc953ecf52d33b76b983ad5491d4d29f5f6a ("Staging: dt3155: fix > parentheses and bracket spacing style issues") from the staging-next tree. > > I fixed it up (see below) and can carry the fix as necessary.
The fix looks fine, thanks.
greg k-h
| |