Messages in this thread | | | Date | Mon, 16 Nov 2009 16:04:02 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the omap_dss2 tree with the omap tree |
| |
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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |