]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'zcrypt' into features
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 25 Jun 2018 08:25:09 +0000 (10:25 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 25 Jun 2018 08:25:09 +0000 (10:25 +0200)
commit49914609696073b97c47d929003519d658ad1fb6
treea289b7aadeba62776491188bcc62fe13862ff47d
parent32576a2f7aabc404db6033c5d7f9273a80a78478
parent2fd0ba18696d77f2783a4b335c4710cfeeb9d87f
Merge branch 'zcrypt' into features

Add the zcrypt base patches into features using a tip branch for
parallel merging via multiple tress.