linux-next: merge conflicts in firmware tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi David,

The linux-next merge of the firmware tree get conflicts in
drivers/media/dvb/ttpci/Kconfig and drivers/media/dvb/ttpci/Makefile.
There conflicts are now against Linus' tree and so could they be resolved
in the firmware tree (by merging at least 2.6.27-rc1), please?

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgpIwiKz8SqNm.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux