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

Trivial merge