Merge tag 'boards-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

Pull ARM SoC board changes from Olof Johansson:
 "This is the smallest board branch we have ever had.  Most of this is a
  few cleanups for board code for Renesas shmobile, with a bit of legacy
  driver support added.  This is strongly trending in the right
  direction now"

* tag 'boards-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: shmobile: Enable R-Car Gen2 CMA code in board files
  ARM: shmobile: armadillo800eva reference: Spelling s/ED/LED/
  ARM: shmobile: armadillo800eva legacy: Add LED support
  ARM: shmobile: lager-reference: Remove workarounds for core clock issues
  ARM: shmobile: koelsch-reference: Remove workarounds for core clock issues

diff --cc arch/arm/mach-shmobile/board-armadillo800eva-reference.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-koelsch-reference.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-koelsch.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-lager-reference.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-lager.c
Simple merge