Merge git://github.com/Jkirsher/net-next
authorDavid S. Miller <davem@davemloft.net>
Fri, 23 Sep 2011 17:56:44 +0000 (13:56 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Sep 2011 17:56:44 +0000 (13:56 -0400)

Trivial merge