Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 3 Jun 2010 19:30:58 +0000 (12:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Jun 2010 19:30:58 +0000 (12:30 -0700)

Trivial merge