summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-02 16:23:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-02 16:23:28 -0700
commit7477838f2e481256a40e0c44b92f9bccb065bc51 (patch)
treef72a69428ce892a717177bd7336d5822ab0ac1e4 /arch/arm/mach-at91
parentc67d9ce1668735a22762251e96b3fd31bb289867 (diff)
parentc6ac44878d9a254f2bad2d2150c88de83c231ddf (diff)
downloadblackbird-obmc-linux-7477838f2e481256a40e0c44b92f9bccb065bc51.tar.gz
blackbird-obmc-linux-7477838f2e481256a40e0c44b92f9bccb065bc51.zip
Merge tag 'defconfig-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next
Pull ARM SoC defconfig updates from Olof Johansson: "A number of defconfig updates for 3.16. We have quite a few of these as new SoCs and drivers get supported, and we've started collecting them in one shared branch. We started halfway through the merge window so there'll be some small conflicts with other branches on nearby changes, but nothing major. Next cycle should be smoother" * tag 'defconfig-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: multi_v7_defconfig: Enable Exynos platform ARM: configs: update Allwinner options ARM: qcom: Enable GSBI driver in defconfig ARM: multi_v7_defconfig: Enable Zynq peripheral drivers ARM: at91/defconfig: sama5_defconfig: updated ARM: add drivers for Colibri T30 to multi_v7_defconfig ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfig ARM: configs: enable XHCI mvebu support in multi_v7_defconfig ARM: multi_v7: Add Allwinner reset drivers to multi_v7_defconfig ARM: sunxi: Add A31 reset driver to sunxi_defconfig ARM: config: Update msm_defconfig ARM: mvebu: enable MSI support in mvebu_v7_defconfig ARM: config: Add qcom_defconfig ARM: configs: enable XHCI mvebu support in mvebu_v7_defconfig
Diffstat (limited to 'arch/arm/mach-at91')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud