diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-11 09:39:58 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-11 09:39:58 -0800 |
| commit | 0d9596958d0be59e6bb373b5e6bc0729cbba5110 (patch) | |
| tree | 516886b4e5a626c4b8c6d013e631b7234ef34128 /arch/arm/mach-omap2/mux.h | |
| parent | a2358a7bc35e388978fc2f7f6b071a0fd27d78c1 (diff) | |
| parent | 5e7c58dc8d9b7f31d418cf98c6a8cad84b86f510 (diff) | |
Merge branch 'for_2.6.39/pm-integration' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/mux.h')
0 files changed, 0 insertions, 0 deletions