diff options
author | 2016-09-02 18:33:47 +0200 | |
---|---|---|
committer | 2016-09-02 18:33:47 +0200 | |
commit | 260caadebde754a3851803a17a8287478c090a80 (patch) | |
tree | 1c91bb7ecc1bf119217aa1b2db7172f3325d0731 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'omap-for-v4.8/legacy-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup (diff) | |
parent | ARM: OMAP2+: use IS_ENABLED() instead of checking for built-in or module (diff) | |
download | linux-dev-260caadebde754a3851803a17a8287478c090a80.tar.xz linux-dev-260caadebde754a3851803a17a8287478c090a80.zip |
Merge tag 'omap-for-v4.9/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
Merge "omap soc updates for v4.9 merge window" from Tony Lindgren:
Two patches from Javier Martinez Canillas <javier@osg.samsung.com>
to update mach-omap1 and mach-oamp2 to use IS_ENABLED macro.
* tag 'omap-for-v4.9/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: use IS_ENABLED() instead of checking for built-in or module
ARM: OMAP1: use IS_ENABLED() instead of checking for built-in or module
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions