Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Mon, 10 Nov 2008 21:24:44 +0000 (13:24 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 10 Nov 2008 21:24:44 +0000 (13:24 -0800)

Trivial merge