linux-next: manual merge of the trivial tree with the fbdev tree

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/video/omap2/displays/panel-n8x0.c between commit ecc8b3708986
("OMAPDSS: Add panel dev pointer to dssdev") from the fbdev tree and
commit 8b513d0cf603 ("treewide: Fix typo in printk") from the trivial
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/video/omap2/displays/panel-n8x0.c
index d3860c5,860b180..0000000
--- a/drivers/video/omap2/displays/panel-n8x0.c
+++ b/drivers/video/omap2/displays/panel-n8x0.c
@@@ -527,7 -527,7 +527,7 @@@ static int n8x0_panel_update(struct oma
  	dh = dssdev->panel.timings.y_res;
  
  	if (x != 0 || y != 0 || w != dw || h != dh) {
- 		dev_err(dssdev->dev, "invaid update region %d, %d, %d, %d\n",
 -		dev_err(&dssdev->dev, "invalid update region %d, %d, %d, %d\n",
++		dev_err(dssdev->dev, "invalid update region %d, %d, %d, %d\n",
  			x, y, w, h);
  		return -EINVAL;
  	}

Attachment: pgp00000.pgp
Description: PGP signature