From: Christian Lamparter <chunkeey@googlemail.com>
Date: Sat, 19 Jan 2013 13:18:33 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/chunkeey/carl9170fw
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=d617e64afcad4c4a589bcbf68adf808959bfcdfb;hp=a9d566ff15e0c7678d6ccf3d60b925abe2a9acc5;p=carl9170fw.git

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