From: Tony Lindgren <tony@atomide.com>
Date: Tue, 20 May 2014 00:24:45 +0000 (-0700)
Subject: Merge tag 'omap-for-v3.16/dt-part2-v2' into omap-for-v3.16/tmp-merge-2014-05-19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35567d93640cfb31f6dbaf5375c59fe91acb785f;p=pandora-kernel.git

Merge tag 'omap-for-v3.16/dt-part2-v2' into omap-for-v3.16/tmp-merge-2014-05-19

Device tree related changes for omaps.

Conflicts:
	include/dt-bindings/pinctrl/omap.h
---

35567d93640cfb31f6dbaf5375c59fe91acb785f
Reading git-diff-tree failed