Merge tag 'omap-devel-c-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Mon, 25 Jun 2012 14:41:17 +0000 (07:41 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 25 Jun 2012 14:41:17 +0000 (07:41 -0700)
Reimplement the OMAP PRCM I/O chain code.  Needed for I/O wakeups to
work correctly.

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


Trivial merge