Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Sat, 27 Feb 2010 10:05:54 +0000 (02:05 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 27 Feb 2010 10:05:54 +0000 (02:05 -0800)

Trivial merge