diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-03-13 10:58:36 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-03-13 10:58:36 +0000 |
| commit | 4d77e08535e26c87828237572a68b0d46ff3c3ac (patch) | |
| tree | ed3eeb69b64bf577cecf62266acd8ce1f5098a24 /init | |
| parent | b17462287302a8db94fb64e35beaa7842599c964 (diff) | |
| parent | 626256a06ac4f8c9e283002172bd5ee6de9d0a7f (diff) | |
Merge branch 'tracking-armlt-arm64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20130315.0tracking-integration-linaro-vexpress-ll-20130313.0
Conflicts:
drivers/clk/versatile/Makefile
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions