Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Tue, 26 Jun 2012 13:55:23 +0000 (06:55 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 26 Jun 2012 13:55:23 +0000 (06:55 -0700)
commit9e74f218abd04dfa082391672295ecc1a3654845
treed668104b1021bcc737b5fadc7992f45a4c638705
parentb955eefc46a6923424cbede2f8ab76c8f5acf056
parent21ff63ad131218048525fbd37d065ce61f03bcbd
Merge branch 'for_3.6/pm/sr-move' of git://git./linux/kernel/git/khilman/linux-omap-pm into devel-driver
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
drivers/power/Kconfig