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

Trivial merge