From: Christian Lamparter <chunkeey@googlemail.com>
Date: Wed, 29 Jun 2011 21:59:27 +0000 (+0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw
X-Git-Tag: 1.9.4~7
X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=commitdiff_plain;h=35cac8dcfa9d01fff0c929f0e2b9cc38fc919589

Merge branch 'master' of git://git./linux/kernel/git/chr/carl9170fw
---

35cac8dcfa9d01fff0c929f0e2b9cc38fc919589