diff options
| author |   Tony Lindgren <tony@atomide.com> | 2011-06-29 04:45:16 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-29 04:45:16 -0700 |
| commit | 48cb1258e8b0f8c81cfb699b42326c5b2147b3f8 (patch) | |
| tree | 6dc560f24eec8d303534d86b1e20d037df94a68d /tools/perf/scripts/python | |
| parent | Merge branch 'devel-timer' into devel-cleanup (diff) | |
| parent | OMAP2+: PM: fix section mismatch in pm_dbg_init() (diff) | |
| download | linux-dev-48cb1258e8b0f8c81cfb699b42326c5b2147b3f8.tar.xz linux-dev-48cb1258e8b0f8c81cfb699b42326c5b2147b3f8.zip | |
Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-cleanup
Conflicts:
arch/arm/mach-omap2/pm-debug.c
arch/arm/mach-omap2/pm.h
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions