Merge git://github.com/Jkirsher/net-next
authorDavid S. Miller <davem@davemloft.net>
Tue, 20 Sep 2011 18:34:54 +0000 (14:34 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 20 Sep 2011 18:34:54 +0000 (14:34 -0400)

Trivial merge