Merge tag 'socfpga_defconfig_updates_for_v4.8' of git://git.kernel.org/pub/scm/linux...
authorOlof Johansson <olof@lixom.net>
Tue, 5 Jul 2016 04:49:15 +0000 (21:49 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 5 Jul 2016 04:49:15 +0000 (21:49 -0700)
commit59f23b6e428bf0a17d55f96df32e71652b597131
tree97acb633932b2c6aa503fc5cb46875d56f738e15
parent208b3e2038c8eed1c0fe455a942c1a720441a241
parent2baf9e9ec0d2528c94f0af41ccc014f63bb3ca03
Merge tag 'socfpga_defconfig_updates_for_v4.8' of git://git./linux/kernel/git/dinguyen/linux into next/defconfig

SoCFPGA defconfig updates for v4.8
- enable PL330 DMA, PCIe, Touchscreen and USB Mass Storage

* tag 'socfpga_defconfig_updates_for_v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: enable PL330 DMA in socfpga_defconfig
  ARM: socfpga: add PCIe to socfpga_defconfig
  ARM: socfpga: Update socfpga_defconfig

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