Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Wed, 29 Jun 2011 21:59:27 +0000 (23:59 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Wed, 29 Jun 2011 21:59:27 +0000 (23:59 +0200)

Trivial merge