diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-23 14:46:19 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-23 14:46:19 -0800 |
| commit | cf11ee8ebcd7d484a42a4db5b1ecf39dbdb56cd1 (patch) | |
| tree | 88af42b435cd9ca44c4d7a854d9c083cc4f4319d /tools/perf/util/scripting-engines/trace-event-perl.c | |
| parent | ce9aead6386c7393fdc5a0dbbe1741936eb5dd8d (diff) | |
| parent | ec800d7906df7b24b0706da0013a2f83b4d4efe8 (diff) | |
Merge tag 'imx-defconfig-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig
Merge "ARM: imx: defconfig update for 3.20" from Shawn Guo:
The i.MX defconfig update for 3.20:
- Eneable FB_MXS, SPI_FSL_QUADSPI, POWER_RESET_SYSCON and module build
for a bunch of USB functions
* tag 'imx-defconfig-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx_v6_v7_defconfig: enable more USB functions
ARM: imx_v6_v7_defconfig: Select CONFIG_FB_MXS
ARM: imx_v6_v7_defconfig: Select SPI_FSL_QUADSPI by default
ARM: imx_v6_v7_defconfig: add POWER_RESET_SYSCON
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