diff options
| author |   Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 13:00:39 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 13:00:39 +0930 |
| commit | 11489736177c5930514482b4db7af862d945335d (patch) | |
| tree | 8590ec4ba037b79c94982e15922fe50a1f0193a3 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | virtio: console: cleanup an error message (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32 (diff) | |
| download | linux-dev-11489736177c5930514482b4db7af862d945335d.tar.xz linux-dev-11489736177c5930514482b4db7af862d945335d.zip | |
Merge branch 'master' into virtio-next
The next commit gets conflicts because it relies on patches which were
cc:stable and thus had to be merged into Linus' tree before the coming
merge window. So pull in master now.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions