Messages in this thread | | | Date | Mon, 23 Apr 2012 15:11:46 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the usb tree |
| |
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in drivers/staging/comedi/drivers/dt9812.c between commit de15fe3ed9c3 ("USB: dt9812.c: remove err() usage") from the usb tree and commit 73e2918990c0 ("staging: Fix typo in multiple files") from the staging tree.
The former supercedes the latter, so I used that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |