diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-06-01 19:08:23 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-06-01 19:08:23 +0300 |
commit | c413d7bab01e88e223efee80b858020164e5eff6 (patch) | |
tree | 9a0309d0e108d2db1738f17568632e54cbbf86ae /tools/perf/scripts/python/export-to-postgresql.py | |
parent | 3139c907dbc2f20b3d06033115b89ae3c5cdd722 (diff) | |
parent | f218e14b62339c6c28aa0c419eba200463cec99a (diff) | |
download | linux-c413d7bab01e88e223efee80b858020164e5eff6.tar.xz |
Merge tag 'imx-defconfig-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig
Merge "The i.MX defconfig updates for 4.2" from Shawn Guo:
- Enable i.MX7D and LS1021A SoC support
- Enable support for WL1271 WIFI/BT, SX8654 I2C touchscreen and PCF8523
RTC, which can be found on Armadeus Systems APF6 and Cubox-i boards.
* tag 'imx-defconfig-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx_v6_v7_defconfig: updates for Armadeus Systems APF6 boards
ARM: config: imx_v6_v7_defconfig add imx7d support
ARM: imx_v6_v7_defconfig: Select LS1021A
ARM: imx_v6_v7_defconfig: Enable RTC PCF8523 support
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions