Prev: [PATCH 2/2] xen: events: Fix checkpatch issues
Next: kbuild: Do not unnecessarily regenerate modules.builtin
From: Stephen Rothwell on 10 Mar 2010 23:20
Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
drivers/video/omap2/vram.c between commit
4ff6baf45cd23593592e5786ccd607bdc8785f4c ("omap: Fix compile for
early_param and omap_smc1") from the omap tree and commit
5c1f96f4cffbdde9e194f3ae5373953f3fa12836 ("OMAP: DSS2: VRAM: Fix
early_param for vram") from the omap_dss2 tree.

Just two versions of the same fix to omap_vram_early_vram(). I used the
omap tree version.
--
Cheers,
Stephen Rothwell sfr(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
 | 
Pages: 1
Prev: [PATCH 2/2] xen: events: Fix checkpatch issues
Next: kbuild: Do not unnecessarily regenerate modules.builtin