[lkml]   [2010]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-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
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.
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2010-03-11 05:21    [W:0.257 / U:0.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site