diff options
author | Ryan Harkin <ryan.harkin@linaro.org> | 2017-07-21 12:52:31 +0100 |
---|---|---|
committer | Ryan Harkin <ryan.harkin@linaro.org> | 2017-07-21 12:52:31 +0100 |
commit | 87f363cf7fd8ab70e5c197dc4f6530c068d4d99c (patch) | |
tree | f616f19f79653c66e90f0846cc4e4740aab51ed6 /drivers/rtc/rtc-digicolor.c | |
parent | b72bb948da638014d47176756b59ead8dee236ee (diff) | |
parent | 557c87a2ff8bc387360056979070de9adf419745 (diff) |
Merge branch 'latest-armlt-fvp' into latest-armlt
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
# Conflicts:
# arch/arm/boot/dts/Makefile
Diffstat (limited to 'drivers/rtc/rtc-digicolor.c')
0 files changed, 0 insertions, 0 deletions