diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 22:46:16 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 22:46:16 +0200 |
commit | 0b8467ee39721340450482e87471ca4c0d6170f3 (patch) | |
tree | efabb381fdec807b3486c9bc8e93950c2d414b1c /net/802/mrp.c | |
parent | 19ce4f4a03e52bc694dc837a4a832111cb4271b3 (diff) | |
parent | db35234ec7a7a10145cf472f68e1c73fbd48f79c (diff) |
Merge tag 'pmu-exynos-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
From Kukjin Kim <kgene.kim@samsung.com>:
add support arm-pmu for exynos4 and exynos5250
* tag 'pmu-exynos-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Add arm-pmu DT binding for exynos421x
ARM: EXYNOS: Add arm-pmu DT binding for exynos5250
ARM: EXYNOS: Enable PMUs for exynos4
irqchip: exynos-combiner: Correct combined IRQs for exynos4
irqchip: exynos-combiner: Add set_irq_affinity function for combiner_irq
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/802/mrp.c')
0 files changed, 0 insertions, 0 deletions