From: Tony Lindgren <tony@atomide.com>
Date: Mon, 25 Jun 2012 14:41:17 +0000 (-0700)
Subject: Merge tag 'omap-devel-c-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: omap-devel-pm-for-v3.6~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a17d88e0586bb7189655f8f99484a872a474626;p=pandora-kernel.git

Merge tag 'omap-devel-c-for-3.6' of git://git./linux/kernel/git/pjw/omap-pending into devel-pm

Reimplement the OMAP PRCM I/O chain code.  Needed for I/O wakeups to
work correctly.

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

9a17d88e0586bb7189655f8f99484a872a474626
Reading git-diff-tree failed