Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Sat, 6 Dec 2008 06:23:34 +0000 (22:23 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 6 Dec 2008 06:23:34 +0000 (22:23 -0800)

Trivial merge