Merge tag 'socfpga_defconfig_for_v4.4' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Thu, 22 Oct 2015 17:10:28 +0000 (10:10 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 22 Oct 2015 17:10:28 +0000 (10:10 -0700)
commitb52d2320276cfeb8e8eccdc1b87a3c078da255cf
tree817fc5300de9f0c83ed38f627b08d4a06d7939c6
parentc2c73aa8593b9996b9b6f85daf21956c7d655fb6
parentb97cecc7a61df121f2c1e350e09fc784a1706ef0
Merge tag 'socfpga_defconfig_for_v4.4' of git://git./linux/kernel/git/dinguyen/linux into next/defconfig

SoCFPGA defconfig update for v4.4
- Add the FPGA manager config option

* tag 'socfpga_defconfig_for_v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga_defconfig: enable fpga manager

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