Merge tag 'socfpga_driver_for_v3.18' of git://git.rocketboards.org/linux-socfpga...
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Sep 2014 15:51:31 +0000 (17:51 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Sep 2014 15:51:31 +0000 (17:51 +0200)
Pull "SOCFPGA driver update for v3.18" from Dinh Nguyen:

This is the EDAC driver for EDAC. Boris had given me permission to
take this patch together with it's DTS component. The DTS portion was in the
previous pull request.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'socfpga_driver_for_v3.18' of git://git.rocketboards.org/linux-socfpga-next:
  edac: altera: Add Altera SDRAM EDAC support


Trivial merge