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)
commit1a2a8de6909ff0e6867767d8fa2b75c9275cfa6f
tree742941536d0be10b84498b7697019b4b2799c528
parent7f544a510954a62b7405477a7b6a2ae25dda0b56
parent48a2e12adb7f4d1a03720d3923bedbc13ab96143
Merge tag 'at91-ab-4.6-defconfig' of git://git./linux/kernel/git/abelloni/linux into next/defconfig

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>