Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorDavid S. Miller <davem@davemloft.net>
Wed, 28 Mar 2012 02:15:01 +0000 (22:15 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Mar 2012 02:15:01 +0000 (22:15 -0400)

Trivial merge