diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-01-27 16:46:51 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-01-27 16:46:51 +0100 |
| commit | ec026b5020688a8bde5fae9a69ae3c59b66ba3ae (patch) | |
| tree | f476a1a9970af763720bd64b090879fc9874dbcf /net/nfc/llcp.h | |
| parent | bba8e3f42736cf7f974968a818e53b128286ad1d (diff) | |
| parent | a971c5545c3d45a1e33fda6e57913bb75aaa20c9 (diff) | |
Merge tag 'imx-fixes-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into HEAD
Pull "i.MX fixes for 4.10, 3rd round" from Shawn Guo:
- Fix a 'defined but not used' warning in MMDC driver when
CONFIG_PERF_EVENTS is disabled.
- Fix i.MX6DL device tree GPIO4_11 range setting.
- A bandaid fix for boot failure found on a couple of platforms due to
missing 'chosen' and 'memory' node.
* tag 'imx-fixes-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx: Pass 'chosen' and 'memory' nodes
ARM: dts: imx6dl: fix GPIO4 range
ARM: imx: hide unused variable in #ifdef
Diffstat (limited to 'net/nfc/llcp.h')
0 files changed, 0 insertions, 0 deletions