]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57dbe1b ed1098e)
Merge tag 'imx-defconfig-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawng...
authorOlof Johansson <olof@lixom.net>
Fri, 23 Oct 2015 17:56:01 +0000 (10:56 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 23 Oct 2015 17:56:01 +0000 (10:56 -0700)
The i.MX defconfig updates for 4.4:
 - Enable i.MX6UL touchscreen controller support.
 - Remove CONFIG_VMSPLIT_2G option since we already enabled
   CONFIG_HIGHMEM support.

* tag 'imx-defconfig-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Remove CONFIG_VMSPLIT_2G
  ARM: imx_v6_v7_defconfig: enable imx6ul_tsc

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge
Linux kernel for KaRo TX COM modules