Hi David,
Today's linux-next merge of the firmware tree got a conflict in
drivers/media/dvb/ttpci/Kconfig between commit
445c2714cf72817ab1ad3ca894c6d9b2047b3a3e ("V4L/DVB (8534): remove
select's of FW_LOADER") from Linus' tree and commit
06c8b7a8fde544f1145365ab6df2d3254301923f ("firmware: convert av7110
driver to request_firmware()") from the firmware tree.
Just a context conflict. I fixed it up.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp5r4u9nHdY1.pgp
Description: PGP signature
