Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Fri, 24 Jun 2011 06:39:33 +0000 (23:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Jun 2011 06:39:33 +0000 (23:39 -0700)

Trivial merge