From: Christian Lamparter <chunkeey@googlemail.com>
Date: Sat, 1 Jun 2013 20:24:51 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/chunkeey/carl9170fw
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=9288bfffd420d06945e607d6df0d581f3a582508;hp=e5ef38a8fa9ef524c3ef061083ce35d1529e5ea0;p=carl9170fw.git

Merge branch 'master' of git://github.com/chunkeey/carl9170fw
---