From: Olof Johansson Date: Fri, 19 May 2017 06:54:47 +0000 (-0700) Subject: Merge tag 'v4.12-rc1' into fixes X-Git-Tag: v4.14-rc1~713^2~26 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5252d73756f318f182f2316acd78a6532041414d;p=platform%2Fkernel%2Flinux-rpi.git 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 --- 5252d73756f318f182f2316acd78a6532041414d