From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 20 May 2015 15:31:33 +0000 (+0200)
Subject: Merge tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre... 
X-Git-Tag: omap-for-v4.3/legacy-v2-signed~130^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03c1fb7e96a3154dbcbbc16883c4693ead3d558a;p=pandora-kernel.git

Merge tag 'at91-defconfig' of git://git./linux/kernel/git/nferre/linux-at91 into next/defconfig

Merge "First batch of defconfig changes for 4.2" from Nicolas Ferre:
- fixed regulators for sd/mmc
- addition of AT91 to the multi_v7_defconfig

* tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: multi_v7_defconfig: Add Atmel SAMA5 family
  ARM: at91/defconfig: add CONFIG_REGULATOR_FIXED_VOLTAGE for mmc driver

Conflicts:
	arch/arm/configs/multi_v7_defconfig
---

03c1fb7e96a3154dbcbbc16883c4693ead3d558a
Reading git-diff-tree failed