Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless-next
authorDavid S. Miller <davem@davemloft.net>
Tue, 11 Oct 2011 19:39:21 +0000 (15:39 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 11 Oct 2011 19:39:21 +0000 (15:39 -0400)

Trivial merge