projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: addcbe2 822cfdf)
Merge tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre...
authorArnd Bergmann <arnd@arndb.de>
Wed, 20 May 2015 15:31:33 +0000 (17:31 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 20 May 2015 15:31:33 +0000 (17:31 +0200)
commit03c1fb7e96a3154dbcbbc16883c4693ead3d558a
tree1a111551d1d8afc85dce5464ca6c13d1f0422b06tree | snapshot
parentaddcbe2ae91ceaff149ceb07cf61d1bb3998276ecommit | diff
parent822cfdfb9511c2658a10a21b0323144c632aa08ccommit | diff
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
arch/arm/configs/multi_v7_defconfig diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git