Merge branch 'for_2.6.39/pm-misc' of ssh://master.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Fri, 11 Mar 2011 02:54:14 +0000 (18:54 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 11 Mar 2011 02:54:14 +0000 (18:54 -0800)
commit94a06b74e724caabcf0464c81527cfbcae0c8aff
tree3570b6a627382a5eb5c8328b4959f615544d8e62
parent0dde52a9f5330eec240660191a94b51bd911ffcd
parent9062511097683b4422f023d181b4a8b2db1a7a72
Merge branch 'for_2.6.39/pm-misc' of ssh:///linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/common.c
arch/arm/mach-omap2/mailbox.c
arch/arm/plat-omap/include/plat/common.h