Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Tue, 23 Oct 2012 17:26:30 +0000 (13:26 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Oct 2012 17:26:30 +0000 (13:26 -0400)

Trivial merge