Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Wed, 16 Feb 2011 18:53:08 +0000 (19:53 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Wed, 16 Feb 2011 18:53:08 +0000 (19:53 +0100)

Trivial merge