Merge branch 'for-erwan' of git://git.zytor.com/users/pam/hdt-pierre into for-erwan
authorPierre-Alexandre Meyer <pierre@mouraf.org>
Fri, 15 May 2009 05:24:20 +0000 (22:24 -0700)
committerPierre-Alexandre Meyer <pierre@mouraf.org>
Fri, 15 May 2009 05:24:20 +0000 (22:24 -0700)
commit28ef450da5869ecfd4d7d7226f6008c942525996
tree17d6c30734dc04d69299beeef2a4ebf94c628962
parent897f8349b7f231329d0059ffc6645074ec8ab903
parent4899adbd7ad688fb6a6b8dc2f8aad54719168e09
Merge branch 'for-erwan' of git://git.zytor.com/users/pam/hdt-pierre into for-erwan

Conflicts:
com32/gplinclude/dmi/dmi.h
com32/gpllib/dmi/dmi.c
com32/hdt/hdt-cli-dmi.c

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