Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 Aug 2010 22:59:38 +0000 (15:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Aug 2010 22:59:38 +0000 (15:59 -0700)

Trivial merge