Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree

2013-04-09 Thread Arnd Bergmann
On Tuesday 09 April 2013, Stephen Rothwell wrote: > > - #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE) > -static void __init sdp2430_display_init(void) > -{ > - int r; > - > - static struct gpio gpios[] __initdata = { > - { SDP2430_LCD_PANEL_ENABLE_GPIO, G

Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree

2012-11-26 Thread Tony Lindgren
* Stephen Rothwell [121126 02:58]: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/plat-omap/common.c between commit b022e17b1c7e ("OMAP: common.c: > remove init call to vram") from the omap_dss2 tree and commit > f583f0f2c720 ("ARM: OMAP2+: Move omap_reser

Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree

2012-09-24 Thread Tony Lindgren
* Tomi Valkeinen [120924 06:12]: > Hi Arnd, > > On Mon, 2012-09-24 at 12:43 +, Arnd Bergmann wrote: > > On Monday 24 September 2012, Stephen Rothwell wrote: > > > Today's linux-next merge of the arm-soc tree got a conflict in > > > drivers/video/omap/lcd_ams_delta.c between commit 9586778de55

Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree

2012-09-24 Thread Tomi Valkeinen
Hi Arnd, On Mon, 2012-09-24 at 12:43 +, Arnd Bergmann wrote: > On Monday 24 September 2012, Stephen Rothwell wrote: > > Today's linux-next merge of the arm-soc tree got a conflict in > > drivers/video/omap/lcd_ams_delta.c between commit 9586778de558 ("OMAPFB1: > > remove unnecessary includes")

Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree

2012-09-24 Thread Arnd Bergmann
On Monday 24 September 2012, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/video/omap/lcd_ams_delta.c between commit 9586778de558 ("OMAPFB1: > remove unnecessary includes") from the tree and commit e27e35ec735f > ("ARM: OMAP1: Move board-ams-del