Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless
authorDavid S. Miller <davem@davemloft.net>
Thu, 15 Sep 2011 21:13:04 +0000 (17:13 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 Sep 2011 21:13:04 +0000 (17:13 -0400)

Trivial merge