Messages in this thread | | | Date | Fri, 29 Jun 2012 15:57:24 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the trivial tree |
| |
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in drivers/staging/comedi/drivers/s626.h between commit 6ac7d11527a3 ("treewide: Put a space between #include and FILE") from the trivial tree and commit 90fd56af25b7 ("staging: comedi: s626: remove private INLINE macro") from the staging tree.
Just context changes. I fixed it up and can carry the fix as necessary.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |