Messages in this thread | | | Date | Wed, 28 Apr 2010 08:25:39 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging-next tree with the pcmcia tree |
| |
On Wed, Apr 28, 2010 at 04:11:53PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging-next tree got a conflict in > drivers/staging/netwave/netwave_cs.c between commit > c8bf6e66c254bba7d0ea3f5d02420776dceac657 ("pcmcia: re-work > pcmcia_request_irq()") from the pcmcia tree and commit > 3c7475d0aaad3614f6b1db291310c577eee3fb33 ("Staging: netwave: fixed > trailing whitespace style issue in netwave_cs.c") from the staging-next > tree. > > I fixed it up (see below) and can carry the fix as necessary.
Fix looks fine, thanks.
greg k-h
| |