linux-next: merge conflicts in firmware tree

From: Stephen Rothwell <hidden>
Date: 2008-08-22 04:34:51 

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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Attachments

  • (unnamed) [application/pgp-signature] 197 bytes
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help