Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/staging/stradis/stradis.c between commit
aef01debdfad83ab71a83b7af8cd90203404c1aa ("[media] cpia, stradis: remove
deprecated V4L1 drivers") from the v4l-dvb tree and commit
b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk
typos") from the trivial tree.
The former removed the file modified by the latter, so I removed the file.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpA2RLVqs1C_.pgp
Description: PGP signature
