]> git.neil.brown.name Git - history.git/commit
Resolve conflicts with aviro changes.
authorDavid S. Miller <davem@nuts.ninka.net>
Mon, 28 Oct 2002 12:11:20 +0000 (04:11 -0800)
committerDavid S. Miller <davem@nuts.ninka.net>
Mon, 28 Oct 2002 12:11:20 +0000 (04:11 -0800)
commit52712a65e8f69f4564a7d9494f05ee910a9d244d
treeb003f15f3d961d266932f15eb4cc9494450ade9a
parent2829a935f02f60aa1b409b8e1612f34d8f023ada
parentc60d1feadad40e35050c3b7236138b1142a9f717
Resolve conflicts with aviro changes.