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

Trivial merge