]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge tag 'socfpga_updates_for_3.15_v2' of git://git.rocketboards.org/linux-socfpga...
authorArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 09:26:40 +0000 (10:26 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 09:26:40 +0000 (10:26 +0100)
commitde65ded49e95dbbd685b613a615f6821868e5b33
tree3bfd84f248722ab357fd748723bace6e5603c554
parenta929478f6720ac15d949117188cd6798b4a9c286
parenta5d6ac2a84a393a7142f9cafe15ade9aa94b6b42
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 <arnd@arndb.de>