From: Tony Lindgren <tony@atomide.com>
Date: Tue, 3 Apr 2012 16:46:37 +0000 (-0700)
Subject: Merge branch 'io_chain_devel_3.4' of git://git.pwsan.com/linux-2.6 into prm
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58adb292f0c77a92fabd74b9d20508a21b00eb5b;p=pandora-kernel.git

Merge branch 'io_chain_devel_3.4' of git://git.pwsan.com/linux-2.6 into prm

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

58adb292f0c77a92fabd74b9d20508a21b00eb5b
Reading git-diff-tree failed