diff options
author | Tony Lindgren <tony@atomide.com> | 2010-10-08 10:19:36 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-10-08 10:19:36 -0700 |
commit | 582c77d783e0cb1e6c30a330e42582173bcadfd2 (patch) | |
tree | 52847c9701c1ba13e570e0c273a4ea73cbc9ee3a /arch/arm/mach-omap1/board-ams-delta.c | |
parent | bead4375731ad283cccbcbcb55bc7549c9746168 (diff) | |
parent | ebfa88cfa1f00022c500e35db63b5f6c977c95c0 (diff) |
Merge branch 'pm-next-2' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap1/board-ams-delta.c')
0 files changed, 0 insertions, 0 deletions