Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <[email protected]>
Tue, 18 Aug 2009 23:29:16 +0000 (16:29 -0700)
committerDavid S. Miller <[email protected]>
Tue, 18 Aug 2009 23:29:16 +0000 (16:29 -0700)

Trivial merge