diff options
| author | Olof Johansson <[email protected]> | 2015-10-23 17:56:01 +0000 |
|---|---|---|
| committer | Olof Johansson <[email protected]> | 2015-10-23 17:56:01 +0000 |
| commit | 302f9f6b165d6f96b4746866e5e69248523926fb (patch) | |
| tree | 69e664061f03a6f28ccde6e7a4e7aeffc140d9da /net/unix/af_unix.c | |
| parent | Merge tag 'sunxi-defconfig-for-4.4' of https://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | ARM: imx_v6_v7_defconfig: Remove CONFIG_VMSPLIT_2G (diff) | |
| download | kernel-302f9f6b165d6f96b4746866e5e69248523926fb.tar.gz kernel-302f9f6b165d6f96b4746866e5e69248523926fb.zip | |
Merge tag 'imx-defconfig-4.4' of git://git.kernel.org/pub/scm/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 <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions