Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Sat, 29 Aug 2009 06:04:57 +0000 (23:04 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 29 Aug 2009 06:04:57 +0000 (23:04 -0700)

Trivial merge