From: Tony Lindgren <tony@atomide.com>
Date: Fri, 25 Apr 2014 01:52:53 +0000 (-0700)
Subject: Merge branch 'omap-for-v3.15/fixes-v2'
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a9e483cfc5e6fc9d1c51bc3afef500d7aabedc5;p=pandora-kernel.git

Merge branch 'omap-for-v3.15/fixes-v2'

Conflicts:
	arch/arm/boot/dts/omap3-beagle-xm-ab.dts
---

0a9e483cfc5e6fc9d1c51bc3afef500d7aabedc5
Reading git-diff-tree failed