Merge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
authorDavid S. Miller <davem@davemloft.net>
Mon, 24 Oct 2011 07:12:49 +0000 (03:12 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Oct 2011 07:12:49 +0000 (03:12 -0400)

Trivial merge