diff options
| author |   David Sterba <dsterba@suse.com> | 2016-02-26 15:38:34 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:34 +0100 |
| commit | fa695b01bceabc40be3267d309ca8a663de53d7a (patch) | |
| tree | 017a66e7b0c2d928d3edc9531cf04bd3debf346a /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'cleanups-4.6' into for-chris-4.6 (diff) | |
| parent | btrfs: change max_inline default to 2048 (diff) | |
| download | wireguard-linux-fa695b01bceabc40be3267d309ca8a663de53d7a.tar.xz wireguard-linux-fa695b01bceabc40be3267d309ca8a663de53d7a.zip | |
Merge branch 'misc-4.6' into for-chris-4.6
# Conflicts:
# fs/btrfs/file.c
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions