Merge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 4 Nov 2011 01:52:51 +0000 (21:52 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 4 Nov 2011 01:52:51 +0000 (21:52 -0400)

Trivial merge