| commit | d5872766e499376994c7a56a1c4c9e8fcc6c874c | |
| author | H. Peter Anvin <hpa@linux.intel.com> | |
| Thu, 1 Jul 2010 21:26:36 +0000 (1 14:26 -0700) | ||
| committer | H. Peter Anvin <hpa@linux.intel.com> | |
| Thu, 1 Jul 2010 21:26:36 +0000 (1 14:26 -0700) | ||
| tree | cba1a7ca12a3eecc31027b88b325541d0829df94 | treesnapshot (tar.gz zip) |
| parent | f06f55139583f1d0022e78805df6d23fa72ae7d0 | commitdiff |
| parent | 55574c609a2f5ca69e98e5ec57eb909190d12061 | commitdiff |
Merge branch 'master' into lua
Resolved Conflicts:
com32/Makefile
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Resolved Conflicts:
com32/Makefile
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| com32/Makefile | diff1 | diff2 | blobhistory |