Merge tag 'socfpga_defconfig_for_v4.4' of...

Merge tag 'socfpga_defconfig_for_v4.4' of git://git.kernel.org/pub/scm/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>