]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/defconfig' into for-next
authorOlof Johansson <olof@lixom.net>
Tue, 27 May 2014 18:12:56 +0000 (11:12 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 27 May 2014 18:12:56 +0000 (11:12 -0700)
* next/defconfig:
  ARM: multi_v7_defconfig: Enable Zynq peripheral drivers
  ARM: at91/defconfig: sama5_defconfig: updated

1  2 
arch/arm/configs/sama5_defconfig

Simple merge