diff options
author | 2014-05-20 14:22:54 -0500 | |
---|---|---|
committer | 2014-05-20 14:22:54 -0500 | |
commit | 6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7 (patch) | |
tree | e01eaf5fcfed6767da9fcfd8f5120ef667c81bb8 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | Merge branch 'dt-bus-name' into for-next (diff) | |
parent | tty/serial: fix generic earlycon option parsing (diff) | |
download | linux-dev-6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7.tar.xz linux-dev-6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7.zip |
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty into for-next
Conflicts:
arch/arm64/kernel/early_printk.c
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions