linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-shmobile/setup-r8a7779.c between commit 4714a0255eee ("[media] ARM: shmobile: r8a7779: add VIN support") from the v4l-dvb tree and commit fee529df76ff ("ARM: shmobile: r8a7779: cleanup registration of usb phy")

linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-shmobile/setup-r8a7778.c between commit 803c2df21752 ("[media] ARM: shmobile: r8a7778: add VIN support") from the v4l-dvb tree and commits cfa66a81621d ("ARM: shmobile: bockw: add DT reference") and a66c9744574c

linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-shmobile/include/mach/r8a7779.h between commit 4714a0255eee ("[media] ARM: shmobile: r8a7779: add VIN support") from the v4l-dvb tree and commit fee529df76ff ("ARM: shmobile: r8a7779: cleanup registration of usb

linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-shmobile/include/mach/r8a7778.h between commit 803c2df21752 ("[media] ARM: shmobile: r8a7778: add VIN support") from the v4l-dvb tree and commits cfa66a81621d ("ARM: shmobile: bockw: add DT reference"),

linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-shmobile/board-marzen.c between commit 7cef5e7fd1ab ("[media] ARM: shmobile: Marzen: add VIN and ADV7180 support") from the v4l-dvb tree and commits 85469abe4930 ("ARM: shmobile: Remove Marzen use of ") and

linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-shmobile/board-bockw.c between commit 9c43952d0f1e ("[media] ARM: shmobile: BOCK-W: add VIN and ML86V7667 support") from the v4l-dvb tree and commit bockw_init ("ARM: shmobile: r8a7778: cleanup registration of

linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-shmobile/board-bockw.c between commit 9c43952d0f1e ([media] ARM: shmobile: BOCK-W: add VIN and ML86V7667 support) from the v4l-dvb tree and commit bockw_init (ARM: shmobile: r8a7778: cleanup registration of

linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-shmobile/board-marzen.c between commit 7cef5e7fd1ab ([media] ARM: shmobile: Marzen: add VIN and ADV7180 support) from the v4l-dvb tree and commits 85469abe4930 (ARM: shmobile: Remove Marzen use of

linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-shmobile/include/mach/r8a7778.h between commit 803c2df21752 ([media] ARM: shmobile: r8a7778: add VIN support) from the v4l-dvb tree and commits cfa66a81621d (ARM: shmobile: bockw: add DT reference), a66c9744574c

linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-shmobile/include/mach/r8a7779.h between commit 4714a0255eee ([media] ARM: shmobile: r8a7779: add VIN support) from the v4l-dvb tree and commit fee529df76ff (ARM: shmobile: r8a7779: cleanup registration of usb

linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-shmobile/setup-r8a7778.c between commit 803c2df21752 ([media] ARM: shmobile: r8a7778: add VIN support) from the v4l-dvb tree and commits cfa66a81621d (ARM: shmobile: bockw: add DT reference) and a66c9744574c

linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-shmobile/setup-r8a7779.c between commit 4714a0255eee ([media] ARM: shmobile: r8a7779: add VIN support) from the v4l-dvb tree and commit fee529df76ff (ARM: shmobile: r8a7779: cleanup registration of usb phy) from

linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-omap2/board-rx51-peripherals.c between commit 322c183cdc5f ("[media] ARM: mach-omap2: board-rx51-peripherals: Add lirc-rx51 data") from the v4l-dvb tree and commits 2203747c9771 ("ARM: omap: move platform_data

linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-omap2/board-rx51-peripherals.c between commit 322c183cdc5f ([media] ARM: mach-omap2: board-rx51-peripherals: Add lirc-rx51 data) from the v4l-dvb tree and commits 2203747c9771 (ARM: omap: move platform_data