Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless
authorDavid S. Miller <davem@davemloft.net>
Wed, 28 Sep 2011 02:42:30 +0000 (22:42 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Sep 2011 02:42:30 +0000 (22:42 -0400)

Trivial merge