From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Mon, 18 Apr 2005 19:12:00 +0000 (-0700)
Subject: Merge the new object model thing from Daniel Barkalow
X-Git-Tag: v0.99~833
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b51ad4314078298194d23d46e2b4473ffd32a88a?hp=b51ad4314078298194d23d46e2b4473ffd32a88a

Merge the new object model thing from Daniel Barkalow

This was a real git merge with conflicts. I'll commit the scripts I used
to do the merge next.

Not pretty, but it's half-way functional.
---