diff options
author | 2012-12-11 22:15:57 -0800 | |
---|---|---|
committer | 2012-12-11 22:15:57 -0800 | |
commit | 76d8a23b127020472207b281427d3e9f4f1227e4 (patch) | |
tree | e14d7063d96d850fb259115d6fb08cbeb98ccf88 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | max8925_power: Add support for device-tree initialization (diff) | |
parent | Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
download | linux-dev-76d8a23b127020472207b281427d3e9f4f1227e4.tar.xz linux-dev-76d8a23b127020472207b281427d3e9f4f1227e4.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
The merge is merely to fix conflicts before sending a pull request.
Conflicts:
drivers/power/ab8500_btemp.c
drivers/power/ab8500_charger.c
drivers/power/ab8500_fg.c
drivers/power/abx500_chargalg.c
drivers/power/max8925_power.c
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions