aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/scripts/python
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-10-08 10:20:40 -0700
committerTony Lindgren <tony@atomide.com>2010-10-08 10:20:40 -0700
commitbc3caae8a191c712d8ae666d0b8d18807bfe2b14 (patch)
tree7b338ebba2f1fdbcee3785789bf9f4a74d93aa94 /tools/perf/scripts/python
parentMerge branches 'devel-omap1' and 'devel-omap2plus' into omap-for-linus (diff)
parentmanual merge for pm-hwmod-uart due to conflicts (diff)
downloadlinux-bc3caae8a191c712d8ae666d0b8d18807bfe2b14.tar.gz
linux-bc3caae8a191c712d8ae666d0b8d18807bfe2b14.zip
Merge branch 'pm-hwmods' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions