Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 18 Jan 2011 20:50:19 +0000 (12:50 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 Jan 2011 20:50:19 +0000 (12:50 -0800)

Trivial merge