Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 5 Aug 2011 10:35:00 +0000 (03:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 5 Aug 2011 10:35:00 +0000 (03:35 -0700)

Trivial merge