From:  <jgarzik@pretzel.yyz.us>
Date: Thu, 26 May 2005 02:11:14 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch veth
X-Git-Tag: v2.6.12-rc6~145^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8cf0d9d075916c9affa53a0cfa8d1b94c9e95fd7;p=linux.git

Automatic merge of /spare/repo/netdev-2.6 branch veth
---

8cf0d9d075916c9affa53a0cfa8d1b94c9e95fd7