diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-10 12:10:24 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-10 12:10:24 +0900 |
| commit | 69b7290e51e558e1e9c1c9ee4d5d31a3809f0f03 (patch) | |
| tree | f4ad376b3aaf2b68e9066df3885ee8dd297251cb /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | usb: Remove __init from early_dbgp_init() prototype (diff) | |
| parent | Linux 3.18-rc4 (diff) | |
| download | linux-dev-69b7290e51e558e1e9c1c9ee4d5d31a3809f0f03.tar.xz linux-dev-69b7290e51e558e1e9c1c9ee4d5d31a3809f0f03.zip | |
Merge 3.18-rc4 into usb-next.
This resolves a conflict in drivers/usb/host/Kconfig
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions