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

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

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
---

8eb7b4e71f07b16601442fa3f7a564a80698e981
Reading git-diff-tree failed