Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Sat, 29 May 2010 05:36:41 +0000 (22:36 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 29 May 2010 05:36:41 +0000 (22:36 -0700)

Trivial merge