Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorDavid S. Miller <davem@davemloft.net>
Wed, 18 Jan 2012 20:59:32 +0000 (15:59 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Jan 2012 20:59:32 +0000 (15:59 -0500)

Trivial merge