From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 1 Mar 2015 16:21:27 +0000 (+0100)
Subject: Merge branch 'Airblader-defect-1480' into next
X-Git-Tag: 4.10.1~82
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eb969fee67c091ef30855818a26913d0a47d5577;p=i3%2Fi3

Merge branch 'Airblader-defect-1480' into next
---

eb969fee67c091ef30855818a26913d0a47d5577