diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-09 18:22:45 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-09 18:22:45 +0000 |
| commit | 2156eda2aafa0b0f660656246a11d7c2a9947ff9 (patch) | |
| tree | 81c2fadeadc2f62e3a03c5fe78b41087d2926233 /arch/arm/boot/dts/exynos5440.dtsi | |
| parent | bbba26b2fc88c77239ebcd45d7fb669018511dfe (diff) | |
| parent | 312ccd6ab1510724d298ae6c19177e501d6c1ca0 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/coresight' into linux-linaro-lsk
Conflicts:
arch/arm/include/asm/hardware/coresight.h
drivers/Makefile
drivers/of/base.c
Diffstat (limited to 'arch/arm/boot/dts/exynos5440.dtsi')
0 files changed, 0 insertions, 0 deletions