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)
commitbced9f962079f977b1e6d4e5f176bc9fb0dfc13f
tree6a9142cb491b005b1d72a591cd5d837fe8cf4fb9
parent4cf28a613276f0c346415a7a0a13def26ede78db
parent426e6ff2a4bb4ae1c19def78631e28a6cbcd845c
Merge branch 'master' of git://git./linux/kernel/git/chr/carl9170fw