diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 23:19:17 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 23:19:17 +0200 |
| commit | 6d55d5968a8622f3ea20ec40737aea1cfba6438c (patch) | |
| tree | 72481307c22f9b6170591cece793ea24f97a9ddb /arch/arm/boot/dts/ea3250.dts | |
| parent | Merge branch 'next/maintainers' into HEAD (diff) | |
| parent | Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc (diff) | |
| download | linux-6d55d5968a8622f3ea20ec40737aea1cfba6438c.tar.xz linux-6d55d5968a8622f3ea20ec40737aea1cfba6438c.zip | |
Merge branch 'next/soc' into HEAD
Conflicts:
arch/arm/mach-ux500/clock.c
arch/arm/mach-ux500/cpu.c
drivers/clocksource/Makefile
Diffstat (limited to 'arch/arm/boot/dts/ea3250.dts')
0 files changed, 0 insertions, 0 deletions