diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-09 12:27:00 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-09 12:27:00 +0100 |
| commit | 67b5adf6a402921655d337d52845d6d48c6ef2d2 (patch) | |
| tree | 183e5cb8a749cf6efc8153e5eff765f02c8f5258 /arch/arm/boot/dts/at91sam9g35.dtsi | |
| parent | 06d7d3c50be2598d93e1420f0e4c52e00b575114 (diff) | |
| parent | cee7bd6c72b15e357eb375a178532851c72e789c (diff) | |
Merge branch 'tracking-armlt-arm64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20130512.0
Conflicts:
drivers/clk/versatile/Makefile
Diffstat (limited to 'arch/arm/boot/dts/at91sam9g35.dtsi')
0 files changed, 0 insertions, 0 deletions