diff options
author | Olof Johansson <olof@lixom.net> | 2013-04-28 12:24:08 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-04-28 12:24:20 -0700 |
commit | 775c4f66fd855e68a98fc5049003810fe98e2e20 (patch) | |
tree | f5d8e44d5a335b60ee6e3d480a3f3a854b85d974 /drivers/net/ethernet/marvell/sky2.c | |
parent | a4591dcf743ac841f9a7d81399405b8fe77c87bf (diff) | |
parent | 096ee6adcfb79a13ae04150023725c8a67e00ae8 (diff) |
Merge tag 'late-exynos-v3-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into late/dt
From Kukjin Kim:
This allows that device tree enables platform to setup a runtime IO
mapping for the chip id
* tag 'late-exynos-v3-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: Add chip-id controller node on Exynos4/5 SoC
ARM: EXYNOS: Create virtual I/O mapping for Chip-ID controller using device tree
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/sky2.c')
0 files changed, 0 insertions, 0 deletions