diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-23 13:46:55 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-23 13:46:55 -0800 |
| commit | ce9aead6386c7393fdc5a0dbbe1741936eb5dd8d (patch) | |
| tree | 1764076e0dfaa33fd8da9e6cb1dce846fb0163ed /tools/perf/util/scripting-engines/trace-event-perl.c | |
| parent | 51271cecc925ceac3ea6d8ebf63884226eb13c50 (diff) | |
| parent | 697549cdd637841e7c88d0014fe25dfbb72565de (diff) | |
Merge tag 'omap-for-v3.20/defconfig-modular' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig
Merge "omap defconfig changes for v3.20" from Tony Lindgren:
Defconfig changes for omap2plus_defconfig to make it more modular,
and to add few more drivers found on various boards.
* tag 'omap-for-v3.20/defconfig-modular' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap2plus_defconfig: Enable OHCI & EHCI HCD support
ARM: omap2plus_defconfig: Enable misc options for BeagleBoard-X15 platform
ARM: omap2plus_defconfig: Enable pcf857x
ARM: omap2plus_defconfig: Add NOR flash support
ARM: omap2plus_defconfig: Enable support for davinci_emac
ARM: omap2plus_defconfig: enable TPS65218 power button
ARM: omap2plus_defconfig: reduce zImage size on omap2plus_defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-perl.c')
0 files changed, 0 insertions, 0 deletions