Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Wed, 17 Nov 2010 17:56:04 +0000 (09:56 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Nov 2010 17:56:04 +0000 (09:56 -0800)

Trivial merge