diff options
author | Tony Lindgren <tony@atomide.com> | 2011-03-14 11:22:22 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-03-14 11:22:22 -0700 |
commit | 05f689400ea5fa3d71af82f910c8b140f87ad1f3 (patch) | |
tree | 39fa8ddb5163661361dbc5b2ab11f4e331492ead /arch/arm/mach-omap2/pm.h | |
parent | 17fe12c5a7bd674c1e6dca9cf1e250f9cd7b96b1 (diff) | |
parent | 02b7b94ee98a0a463195d148e5c5885a218ee16f (diff) | |
download | linux-05f689400ea5fa3d71af82f910c8b140f87ad1f3.tar.bz2 |
Merge branches 'devel-mux' and 'devel-misc' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/pm.h')
0 files changed, 0 insertions, 0 deletions