From: Kevin Hilman Date: Thu, 10 Oct 2013 22:42:03 +0000 (-0700) Subject: Merge tag 'renesas-cleanup2-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~52^2~9 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65009d43e7d3529f85882874bfe5386cdc547945;p=pandora-kernel.git Merge tag 'renesas-cleanup2-for-v3.13' of git://git./linux/kernel/git/horms/renesas into next/cleanup From Simon Horman: Second round of Renesas ARM based SoC cleanups for v3.13 * Constify platform data and resources in lager board code * Clean up registration of VIN and sh_eth in r8a7778 SoC and bockw board code * Make r8a7778_register_hspi() static in r8a7778 SoC code * tag 'renesas-cleanup2-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: lager: Constify platform data and resources ARM: shmobile: r8a7778: r8a7778_register_hspi() become static ARM: shmobile: r8a7778: cleanup registration of sh_eth ARM: shmobile: r8a7778: cleanup registration of vin Signed-off-by: Kevin Hilman Conflicts: arch/arm/mach-shmobile/board-lager.c --- 65009d43e7d3529f85882874bfe5386cdc547945 Reading git-diff-tree failed