Merge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
authorDavid S. Miller <davem@davemloft.net>
Tue, 18 Oct 2011 00:21:50 +0000 (20:21 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 Oct 2011 00:21:50 +0000 (20:21 -0400)

Trivial merge