Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless-next
authorDavid S. Miller <davem@davemloft.net>
Fri, 16 Sep 2011 19:14:19 +0000 (15:14 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Sep 2011 19:14:19 +0000 (15:14 -0400)

Trivial merge