Merge tag 'socfpga_update_for_v3.18' of git://git.rocketboards.org/linux-socfpga...
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Sep 2014 14:49:28 +0000 (16:49 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Sep 2014 14:49:28 +0000 (16:49 +0200)
commit87e9d8fd26c782623b79f2968431179f29b339f2
tree45e2cf70f4609ee82859d28dd8a34effc750a6c5
parentfacdb3dd378e81b8516a8faa061e0be56d2ae7be
parent75a41826e2c5dc1dc0fd5195fc29b031c97337af
Merge tag 'socfpga_update_for_v3.18' of git://git.rocketboards.org/linux-socfpga-next into next/dt

Pull "arm: dts: Add Altera SDRAM EDAC bindings & devicetree entries" From Dinh Nguyen:

5 of the 6 patches are DTS updates and the 1 patch is updating
the MAINTAINERS entry with my new email address.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'socfpga_update_for_v3.18' of git://git.rocketboards.org/linux-socfpga-next:
  arm: dts: Add Altera SDRAM EDAC bindings & devicetree entries.
  ARM: dts: socfpga: memreserve first 4KB for future system use
  ARM: dts: socfpga: Add SD card detect
  ARM: dts: socfpga: remove extra alias in the ArriaV devkit
  ARM: dts: socfpga: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
  MAINTAINERS: update entries for ARM/SOCFPGA platform
arch/arm/boot/dts/r8a7791-koelsch.dts
arch/arm/boot/dts/rk3066a-bqcurie2.dts
arch/arm/boot/dts/rk3188-radxarock.dts