Hi Tomi, Today's linux-next merge of the omap_dss2 tree got a conflict in arch/arm/configs/omap_3430sdp_defconfig between the omap tree and the omap_dss2 tree. I just used the version from the omap tree as I can't figure out anything better, sorry. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpvd21oNolCS.pgp
Description: PGP signature
