Merge tag 'renesas-dt3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 5 Sep 2014 14:29:57 +0000 (16:29 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 5 Sep 2014 14:29:57 +0000 (16:29 +0200)
commitd5f97a2ce9a9fc8ef3fdb366b01c8b4d2d38332a
treecea39b5b74b8da738da81ea330e01f7b02adb55e
parentf60e660c5adf9af09d2143d6fe1f0f184fb3733d
parent40c488df84f9fbf4b84b4baed6e2cec4a2d946ed
Merge tag 'renesas-dt3-for-v3.18' of git://git./linux/kernel/git/horms/renesas into next/dt

Merge "Third Round of Renesas ARM Based SoC DT Updates for v3.18" from Simon Horman:

* Use tabs for indentation in kzm9g-reference and r8a7779 DTS(I) files
* Add platform device tree bindings documentation
* Add SoC-specific thermal compatible property to r8a73a4 and r8a7779

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-dt3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: kzm9g-reference dts: Use tabs for indentation
  ARM: shmobile: r8a7779 dtsi: Use tabs for indentation
  ARM: shmobile: Add platform device tree bindings documentation
  ARM: shmobile: r8a73a4 dtsi: Add SoC-specific thermal compatible property
  ARM: shmobile: r8a7779 dtsi: Add SoC-specific thermal compatible property