]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'next/cleanup' into for-next
authorKevin Hilman <khilman@linaro.org>
Fri, 11 Oct 2013 21:49:43 +0000 (14:49 -0700)
committerKevin Hilman <khilman@linaro.org>
Fri, 11 Oct 2013 21:49:50 +0000 (14:49 -0700)
commit31e7769e50ae0ac809324516c72b94dcaf340665
tree72d6b6b263038ddf5585719659873ff311ec690a
parent6b20398e100b2a63c33144ae2bf483638ba0e7da
parent65009d43e7d3529f85882874bfe5386cdc547945
Merge branch 'next/cleanup' into for-next

* next/cleanup:
  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 <khilman@linaro.org>
Conflicts:
arch/arm/mach-shmobile/board-bockw.c
arch/arm/arm-soc-for-next-contents.txt
arch/arm/mach-shmobile/board-bockw.c
arch/arm/mach-shmobile/board-lager.c
arch/arm/mach-shmobile/include/mach/r8a7778.h
arch/arm/mach-shmobile/setup-r8a7778.c