Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorDavid S. Miller <davem@davemloft.net>
Thu, 12 Jan 2012 20:10:00 +0000 (12:10 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 Jan 2012 20:10:00 +0000 (12:10 -0800)

Trivial merge