Merge branch 'for_3.5/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Mon, 4 Jun 2012 09:09:45 +0000 (02:09 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 4 Jun 2012 09:09:45 +0000 (02:09 -0700)
commit4564747649db987722aa781280eb8325c6a5a1a8
treec75bd92f4c6a59e9873088f1e5357cd3242977cd
parentf8f5701bdaf9134b1f90e5044a82c66324d2073f
parent1ce029968718477149e7f1fb245a8e82c690cc4a
Merge branch 'for_3.5/fixes/pm' of git://git./linux/kernel/git/khilman/linux-omap-pm into fixes
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/irq.c
arch/arm/mach-omap2/pm34xx.c