Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 8 Dec 2010 16:13:01 +0000 (08:13 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Dec 2010 16:13:01 +0000 (08:13 -0800)

Trivial merge