tree fbdc2ddb066243a11aebc490c4d54e6a42be51e2
parent 94a06b74e724caabcf0464c81527cfbcae0c8aff
parent a08572ae529b1e8de12393eeced661feae8fd44c
author Tony Lindgren <tony@atomide.com> 1299864003 -0800
committer Tony Lindgren <tony@atomide.com> 1299864003 -0800

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