]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge tag 'at91-ab-4.6-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Thu, 25 Feb 2016 00:56:20 +0000 (16:56 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 25 Feb 2016 00:56:20 +0000 (16:56 -0800)
defconfig update for 4.6:
 - Addition of sama5d2 ADC to sama5_defconfig

* tag 'at91-ab-4.6-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: at91/defconfig: add sama5d2 adc support in sama5_defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge