diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2017-03-30 17:22:40 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-03-30 17:22:40 +0200 |
| commit | 88f31b1d5c27f596ad7ae8048a52e0ef20e46104 (patch) | |
| tree | fb84eeda2e7182a2f28b2bfb050b19fc68f22438 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'omap-for-v4.12/soc-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc (diff) | |
| parent | ARM: gemini: don't select SERIAL_OF_PLATFORM (diff) | |
| download | wireguard-linux-88f31b1d5c27f596ad7ae8048a52e0ef20e46104.tar.xz wireguard-linux-88f31b1d5c27f596ad7ae8048a52e0ef20e46104.zip | |
Merge tag 'gemini-multiplat-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/soc
Pull "Gemini multiplatform updates" from Linus Walleij:
- Select the poweroff driver so the system can properly shut down.
This driver is merged in the power tree.
- Select the right Faraday GPIO block (we renamed it).
- Do not select SERIAL_OF_PLATFORM that just create Kconfig
warnings on us. We'll put that into the defconfig instead.
* tag 'gemini-multiplat-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: gemini: don't select SERIAL_OF_PLATFORM
ARM: gemini: select the right GPIO block
ARM: gemini: select gemini poweroff
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions