From: Tony Lindgren <tony@atomide.com>
Date: Mon, 3 Oct 2011 23:38:55 +0000 (-0700)
Subject: Merge branch 'for_3.2/3_omap_devicetree' of git://gitorious.org/omap-pm/linux into dt
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d74ade1e512436265633d8e821ac2c01fc95ab90;p=pandora-kernel.git

Merge branch 'for_3.2/3_omap_devicetree' of git://gitorious.org/omap-pm/linux into dt

Conflicts:
	arch/arm/mach-omap2/omap_l3_noc.c
---

d74ade1e512436265633d8e821ac2c01fc95ab90
Reading git-diff-tree failed