From: Arnd Bergmann Date: Mon, 17 Mar 2014 09:26:40 +0000 (+0100) Subject: Merge tag 'socfpga_updates_for_3.15_v2' of git://git.rocketboards.org/linux-socfpga... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=de65ded49e95dbbd685b613a615f6821868e5b33;p=deliverable%2Flinux.git Merge tag 'socfpga_updates_for_3.15_v2' of git://git.rocketboards.org/linux-socfpga-next into next/drivers Merge "SOCFPGA updates for 3.15 version 2" from Dinh Nguyen: *Update SOCFPGA DTS to include ethernet, sd/mmc, and clock fixes *Add stmmac ethernet glue layer *Update socfpga_defconfig to include sd/mmc, and micrel_phy * tag 'socfpga_updates_for_3.15_v2' of git://git.rocketboards.org/linux-socfpga-next: dts: socfpga: Add sysmgr node so the gmac can use to reference dts: socfpga: Add support for SD/MMC on the SOCFPGA platform dts: socfpga: Update clock entry to support multiple parents ARM: socfpga: Update socfpga_defconfig dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac. net: stmmac: Add SOCFPGA glue driver Signed-off-by: Arnd Bergmann --- de65ded49e95dbbd685b613a615f6821868e5b33