From: Tony Lindgren <tony@atomide.com>
Date: Thu, 18 Sep 2014 17:20:39 +0000 (-0700)
Subject: Merge tag 'dt-for-v3.18' into omap-for-v3.18/tmp-merge
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaf12b95e9bda813d6e7ca4ed3d901f1a9000b13;p=pandora-kernel.git

Merge tag 'dt-for-v3.18' into omap-for-v3.18/tmp-merge

Changes for .dts files for omaps for v3.18 merge window:

- Updates for gta04 to add gta04a3 model
- Add support for Tehnexion TAO3530 boards
- Regulator names for beaglebone
- Pinctrl related updates for omap5, dra7 and am437
- Model name fix for sbc-t54
- Enable mailbox for various omaps

Conflicts:
	arch/arm/mach-omap2/board-generic.c
---

aaf12b95e9bda813d6e7ca4ed3d901f1a9000b13
Reading git-diff-tree failed