Merge commit 'mouraf/for-erwan' into for-erwan
authorPierre-Alexandre Meyer <pierre@mouraf.org>
Thu, 23 Apr 2009 06:57:33 +0000 (23:57 -0700)
committerPierre-Alexandre Meyer <pierre@mouraf.org>
Thu, 23 Apr 2009 06:57:33 +0000 (23:57 -0700)
commitd0a0e562d9554cb38650f64be6e9dab9c29d99de
tree8d95b1534e44569f7d0093230d2b755a329f1903
parent272c28d921ee807dc4c20634873af4b64765cacf
parent13c60849867ecc575b8f28dc259705b772611402
Merge commit 'mouraf/for-erwan' into for-erwan

Conflicts:

com32/hdt/hdt-cli-hdt.c
com32/hdt/hdt-cli-cpu.c
com32/hdt/hdt-cli-dmi.c
com32/hdt/hdt-cli-hdt.c
com32/hdt/hdt-cli-pci.c
com32/hdt/hdt-common.c
com32/hdt/hdt-common.h