| commit | 5252d73756f318f182f2316acd78a6532041414d | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Thu May 18 23:54:47 2017 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Thu May 18 23:54:47 2017 -0700 |
| tree | b082478fca4f00f599bb2ed1547b2652c2bea155 | |
| parent | e84188852a7239d7a144af12f7e5dac8fa88600b [diff] | |
| parent | 2ea659a9ef488125eb46da6eb571de5eae5c43f6 [diff] |
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>