From: Olof Johansson Date: Thu, 20 Mar 2014 21:41:47 +0000 (-0700) Subject: Merge tag 'tegra-for-3.15-defconfig' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3545992ba7c59bff9c556d103190be94da3f013e;p=linux-beck.git Merge tag 'tegra-for-3.15-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/boards Merge "ARM: tegra: defconfig updates for 3.15" from Stephen Warren: The following options are enabled: - ams AS3722 is used as system PMIC for Tegra124 based Venice2. - NXP PCA9546 is used in Cardhu Tegra30 board to connect to 3 cameras. - GSPCA to support the webcam on Venice2. - Allocate 64 MiB for CMA by default; the default 16MiB is not enough for the majority of use-cases. This can still be overridden by the cma command-line option. * tag 'tegra-for-3.15-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: defconfig updates Signed-off-by: Olof Johansson --- 3545992ba7c59bff9c556d103190be94da3f013e