Merge branch 'disklib' into for-erwan
authorPierre-Alexandre Meyer <pierre@mouraf.org>
Sun, 26 Apr 2009 21:35:56 +0000 (14:35 -0700)
committerPierre-Alexandre Meyer <pierre@mouraf.org>
Sun, 26 Apr 2009 21:35:56 +0000 (14:35 -0700)
commit9c5868d154656e3832822dd24dd9701fe55eb2a4
tree71d9da7b5f08f3544703653f958b126a93ca0945
parentd0a0e562d9554cb38650f64be6e9dab9c29d99de
parent7bd5d73a1b559935dae9f6b29703d71856554f3e
Merge branch 'disklib' into for-erwan

Conflicts:

com32/hdt/hdt-common.c

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
com32/hdt/hdt-cli-hdt.c
com32/hdt/hdt-common.c
com32/hdt/hdt-common.h