diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-01-04 16:41:18 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-01-04 16:42:00 +0100 |
| commit | e9b2aefa88c5d9e4ea8fc950da9b105981ad60ec (patch) | |
| tree | 4db9bc06e2ae611448e69364f4650f4a733d5355 /include/net/caif | |
| parent | 5c6ec6a02c1378ba0e3ac530f8c80523ea74e5de (diff) | |
| parent | fcdaf1a2a7a042a290f4c7de28bcdebd5de18445 (diff) | |
Merge tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into fixes
Pull "Amlogic fixes for v4.10" from Kevin Hilman:
- DT: GXL: fix GPIO include
- add DT and defconfig for newly merged DRM driver
This pull has one real fix, as a couple non-critical ones. The DRM
DT/defconfig patches are coming now because I didn't expect the new
driver to make it for the v4.10 merge window, but since it did[1], the
DT and defconfig should go into the same release.
[1] bbbe775ec5b5 drm: Add support for Amlogic Meson Graphic Controller
* tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
ARM64: defconfig: enable DRM_MESON as module
ARM64: dts: meson-gx: Add Graphic Controller nodes
ARM64: dts: meson-gxl: fix GPIO include
Diffstat (limited to 'include/net/caif')
0 files changed, 0 insertions, 0 deletions