From: Christian Lamparter <chunkeey@googlemail.com>
Date: Sat, 6 Oct 2012 18:24:28 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/chunkeey/carl9170fw
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=8d4c0cbe2efec53965a6a9e24df1688abb268184;hp=8d4c0cbe2efec53965a6a9e24df1688abb268184;p=carl9170fw.git

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