diff options
| author |   Olof Johansson <olof@lixom.net> | 2017-05-18 23:54:47 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-05-18 23:54:47 -0700 |
| commit | 5252d73756f318f182f2316acd78a6532041414d (patch) | |
| tree | b082478fca4f00f599bb2ed1547b2652c2bea155 /scripts/dtc/include-prefixes/arm | |
| parent | tee: add ARM_SMCCC dependency (diff) | |
| parent | Linux 4.12-rc1 (diff) | |
| download | linux-dev-5252d73756f318f182f2316acd78a6532041414d.tar.xz linux-dev-5252d73756f318f182f2316acd78a6532041414d.zip | |
Merge tag 'v4.12-rc1' into fixes
We've received a few fixes branches with -rc1 as base, but our contents was
still at pre-rc1. Merge it in expliticly to make 'git merge --log' clear on
hat was actually merged.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'scripts/dtc/include-prefixes/arm')
0 files changed, 0 insertions, 0 deletions