From: Tony Lindgren <tony@atomide.com>
Date: Tue, 4 Oct 2011 16:17:15 +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=0fad4451f3612b3280e5ebdb690a150eedebe954;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
---

0fad4451f3612b3280e5ebdb690a150eedebe954
Reading git-diff-tree failed