projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 208b3e2 2baf9e9)
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)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.