diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2014-03-18 16:25:47 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-18 16:25:47 +0100 |
| commit | a65b5f4ccda42f416b7edf2c83ef9ccd5a8a181d (patch) | |
| tree | ff2025ad147593b78b6b93b13727021a8ccc6a56 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Merge tag 'sti-reset-for-v3.15' of git://git.stlinux.com/devel/kernel/linux-sti into next/drivers (diff) | |
| parent | ARM: virt: select ARM_AMBA (diff) | |
| download | wireguard-linux-a65b5f4ccda42f416b7edf2c83ef9ccd5a8a181d.tar.xz wireguard-linux-a65b5f4ccda42f416b7edf2c83ef9ccd5a8a181d.zip | |
Merge branch 'cleanup/kconfig' into next/drivers
This resolves a conflict between the new sti reset
controller driver and the Kconfig cleanup.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions