Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Fri, 14 Aug 2009 19:29:17 +0000 (12:29 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Aug 2009 19:29:17 +0000 (12:29 -0700)

Trivial merge