Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Mon, 14 Feb 2011 20:51:42 +0000 (12:51 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Feb 2011 20:51:42 +0000 (12:51 -0800)

Trivial merge