Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 6 Nov 2008 23:52:00 +0000 (15:52 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 6 Nov 2008 23:52:00 +0000 (15:52 -0800)

Trivial merge