Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration...
authorTony Lindgren <tony@atomide.com>
Fri, 11 Mar 2011 17:20:03 +0000 (09:20 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 11 Mar 2011 17:20:03 +0000 (09:20 -0800)
commita2358a7bc35e388978fc2f7f6b071a0fd27d78c1
treefbdc2ddb066243a11aebc490c4d54e6a42be51e2
parent94a06b74e724caabcf0464c81527cfbcae0c8aff
parenta08572ae529b1e8de12393eeced661feae8fd44c
Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus

Conflicts:
arch/arm/mach-omap2/pm34xx.c
MAINTAINERS
arch/arm/mach-omap2/cpuidle34xx.c
arch/arm/mach-omap2/omap_twl.c
arch/arm/mach-omap2/opp3xxx_data.c
arch/arm/mach-omap2/opp4xxx_data.c
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/pm24xx.c
arch/arm/mach-omap2/pm34xx.c
arch/arm/mach-omap2/smartreflex.c