diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-20 17:31:33 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-20 17:31:33 +0200 |
| commit | 03c1fb7e96a3154dbcbbc16883c4693ead3d558a (patch) | |
| tree | 1a111551d1d8afc85dce5464ca6c13d1f0422b06 /arch/arm/configs/vf610m4_defconfig | |
| parent | addcbe2ae91ceaff149ceb07cf61d1bb3998276e (diff) | |
| parent | 822cfdfb9511c2658a10a21b0323144c632aa08c (diff) | |
Merge tag 'at91-defconfig' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/arm/configs/vf610m4_defconfig')
0 files changed, 0 insertions, 0 deletions