Code

Merge the new object model thing from Daniel Barkalow
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 18 Apr 2005 19:12:00 +0000 (12:12 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 18 Apr 2005 19:12:00 +0000 (12:12 -0700)
commitb51ad4314078298194d23d46e2b4473ffd32a88a
tree3dfffcf747e4fbdb04f1b43251be932f69f55476
parenta4b7dbef4ef53f4fffbda0a6f5eada4c377e3fc5
parentb5039db6d25ae25f1cb2db541ed13602784fafc3
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.
Makefile
fsck-cache.c
merge-base.c