| commit | b15c78b8847d2e75d728c073d5713ebce6885b1b | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 11:43:56 +0000 (30 14:43 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 11:43:56 +0000 (30 14:43 +0300) | ||
| tree | 2ab634c692a5d705b88895fb180396d47daaffad | treesnapshot (tar.gz zip) |
| parent | 0c283834194ad89b59c4779051bbf129b6ff2a6f | commitdiff |
| parent | 943e0a319cddac80e0dd41d43f4f6901e31747bc | commitdiff |
Merge commit '943e0a319cddac80e0dd41d43f4f6901e31747bc' into upstream-merge
* commit '943e0a319cddac80e0dd41d43f4f6901e31747bc':
Substitute ifdef CONFIG_FOO by obj-
Substitute ifdef CONFIG_FOO by obj-
Conflicts:
Makefile.target
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '943e0a319cddac80e0dd41d43f4f6901e31747bc':
Substitute ifdef CONFIG_FOO by obj-
Substitute ifdef CONFIG_FOO by obj-
Conflicts:
Makefile.target
Signed-off-by: Avi Kivity <avi@redhat.com>
| Makefile | diff1 | diff2 | blobhistory |
| Makefile.target | diff1 | diff2 | blobhistory |