Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/media/dvb/cinergyT2/cinergyT2.c between commit
986bd1e58b18c09b753f797df19251804bfe3e84 ("V4L/DVB (9107): Alternative
version of Terratec Cinergy T2 driver") from Linus' tree and commit
58e43f3f48c28cc35be7502b5aa81ce53de51815 ("USB: remove warn() macro from
usb media drivers") from the usb tree.
The former commit removes the file, so I have done that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpYDM69TubFu.pgp
Description: PGP signature
