From: Martin Schwidefsky Date: Wed, 22 Mar 2017 07:22:02 +0000 (+0100) Subject: Merge branch 'guarded-storage' into 'features' to make merging with X-Git-Tag: v4.12-rc1~139^2~56 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bffc880b451f1e440efe1b8bd3af365018ec314a;p=users%2Fjedix%2Flinux-maple.git Merge branch 'guarded-storage' into 'features' to make merging with the KVM tree easier. --- bffc880b451f1e440efe1b8bd3af365018ec314a