Merge git://github.com/Jkirsher/net-next
authorDavid S. Miller <davem@davemloft.net>
Fri, 7 Oct 2011 16:34:52 +0000 (12:34 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Oct 2011 16:34:52 +0000 (12:34 -0400)

Trivial merge