| commit | a2358a7bc35e388978fc2f7f6b071a0fd27d78c1 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Fri Mar 11 09:20:03 2011 -0800 |
| committer | Tony Lindgren <tony@atomide.com> | Fri Mar 11 09:20:03 2011 -0800 |
| tree | fbdc2ddb066243a11aebc490c4d54e6a42be51e2 | |
| parent | 94a06b74e724caabcf0464c81527cfbcae0c8aff [diff] | |
| parent | a08572ae529b1e8de12393eeced661feae8fd44c [diff] |
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