aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/scripts/python/export-to-postgresql.py
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-04-03 10:32:47 -0700
committerTony Lindgren <tony@atomide.com>2013-04-03 10:32:47 -0700
commit43231b5be657fde1c4ced180d829bbd59ceef9ad (patch)
treec20d5c79e63533abf71ab8f89598eb777e9bee2b /tools/perf/scripts/python/export-to-postgresql.py
parentMerge branch 'for_3.10/omap5_generic_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux into omap-for-v3.10/fixes-non-critical (diff)
parentARM: OMAP: use consistent error checking (diff)
downloadlinux-dev-43231b5be657fde1c4ced180d829bbd59ceef9ad.tar.xz
linux-dev-43231b5be657fde1c4ced180d829bbd59ceef9ad.zip
Merge commit '7185684' into omap-for-v3.10/timer
Conflicts: arch/arm/plat-omap/dmtimer.c Resolve merge conflict in omap_device.c as per Lothar Waßmann <LW@KARO-electronics.de>.
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions