Messages in this thread |  | | Subject | Re: linux-next: manual merge of the omap_dss2 tree with the arm-soc tree | | From | Tomi Valkeinen <> | | Date | Wed, 21 Sep 2011 09:12:04 +0300 |
| |
Hi Stephen,
On Wed, 2011-09-21 at 12:58 +1000, Stephen Rothwell wrote: > Hi Tomi, > > Today's linux-next merge of the omap_dss2 tree got a conflict in > arch/arm/mach-omap2/board-4430sdp.c between commit 8f5b5a41ebc7 ("ARM: > OMAP: Introduce SoC specific early_init") from the arm-soc tree and > commit 58282610da02 ("OMAP: 4430SDP: Remove unneeded lcd config") from > the omap_dss2 tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Thanks, looks correct.
Tomi
|  |