aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Roxell <anders.roxell@linaro.org>2015-08-17 09:03:01 +0200
committerAnders Roxell <anders.roxell@linaro.org>2015-08-17 09:03:01 +0200
commit7ad3bf1e869ca6223cf039ad9a33e9d44791d691 (patch)
tree894d16f591b8b394facb6ee0e91ad4d701b994e1
parentefa1a61a3804436e17539206215b606edf9677a0 (diff)
parent409a9705f61a3e62dadb7172e20f2f422d8241b3 (diff)
downloadlinux-linaro-stable-7ad3bf1e869ca6223cf039ad9a33e9d44791d691.tar.gz
Merge branch 'v4.1.3-rt3' into v4.1.5-rt5
Used the "ours" merge strategy to throw away the previous -rt releases
0 files changed, 0 insertions, 0 deletions