Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Mon, 22 Dec 2008 03:57:10 +0000 (19:57 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 22 Dec 2008 03:57:10 +0000 (19:57 -0800)

Trivial merge