Merge git://github.com/Jkirsher/net-next
authorDavid S. Miller <davem@davemloft.net>
Thu, 29 Sep 2011 19:41:20 +0000 (15:41 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 29 Sep 2011 19:41:20 +0000 (15:41 -0400)

Trivial merge