mirror of
https://github.com/xenia-project/linux.git
synced 2026-01-31 01:35:30 +01:00
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>