diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 10:57:51 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 10:57:51 -0700 |
| commit | 19915e623458004547c1c2490b09bb923fe69337 (patch) | |
| tree | b794a81ddf083ed08a5bb32820c2dd0121ed74b2 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
| parent | Merge tag 'usb-serial-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next (diff) | |
| parent | Linux 4.1-rc7 (diff) | |
| download | linux-dev-19915e623458004547c1c2490b09bb923fe69337.tar.xz linux-dev-19915e623458004547c1c2490b09bb923fe69337.zip | |
Merge 4.1-rc7 into usb-next
This resolves a merge issue in musb_core.c and we want the fixes that
were in Linus's tree in this branch as well for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions