From: Linus Torvalds Date: Wed, 10 Dec 2014 01:04:13 +0000 (-0800) Subject: Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~10 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=151cd97630f87451cab412e40750d0e5f7581c98;p=pandora-kernel.git Merge tag 'defconfig-for-linus' of git://git./linux/kernel/git/arm/arm-soc Pull ARM SoC defconfig changes from Arnd Bergmann: "This is a collection of the various changes to defconfig files, most importantly enabling some additional platforms in the multi_v7_defconfig file. These are split out into a separate branch to avoid most of the merge conflicts in the defconfig files. This also touches 12 other defconfig files for shmobile, at91, hisilicon, keystone, mvebu, omap, and tegra" * tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (36 commits) ARM: omap2plus_defconfig: enable ECAP and EHRPWM ARM: omap2plus_defconfig: enable XHCI ARM: omap2plus_defconfig: enable AM33XX SoC sound ARM: omap2plus_defconfig: enable EDT FT5X06 touchscreen ARM: omap2plus_defconfig: remove unwanted ethernet drivers ARM: multi_v7_defconfig: enable MAX77686 PMIC drivers for exynos4412-prime based SoCs ARM: at91/defconfig: add DM9000 to at91_dt ARM: at91/defconfig: add QT1070 to at91_dt ARM: at91/defconfig: add TCB PWM driver selection ARM: at91/defconfig: add the XDMA driver ARM: at91: sama5: update defconfig ARM: defconfig: imx_v6_v7_defconfig updates ARM: multi_v7_defconfig: add driver support for hix5hd2 ARM: exynos_defconfig: Use 16 minors per MMC block device ARM: mvebu: add MTD_BLOCK to mvebu_v7_defconfig ARM: mvebu: enable i2c device in mvebu_v7_defconfig ARM: mvebu: re-enable SDHCI driver for Armada 38x SoC in v7 defconfig ARM: tegra: Regenerate default configuration ARM: multi_v7_defconfig: Enable cgroups ARM: multi_v7_defconfig: Enable Broadcom Cygnus ... --- 151cd97630f87451cab412e40750d0e5f7581c98 Reading git-diff-tree failed