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)
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>

Trivial merge