git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit302f9f6b165d6f96b4746866e5e69248523926fb
tree69e664061f03a6f28ccde6e7a4e7aeffc140d9datree
parent57dbe1baaceacb034b4c00050f04c1a3b726e9c7commit | diff
parented1098e4738d935cef12833b08916f6f5e700652commit | diff
Merge tag 'imx-defconfig-4.4' of git://git./linux/kernel/git/shawnguo/linux into next/defconfig

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>
Unnamed repository; edit this file 'description' to name the repository.