diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 14:39:18 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 14:39:18 -0500 |
| commit | c072937128956e0a24d60087b23985eed9b7e000 (patch) | |
| tree | 30dbbf868845acd99099c7165769f1762fa40e28 /Makefile.hw | |
| parent | 0cb13d491b839af4ffbd9052299d2433dc27f201 (diff) | |
| download | qemu-c072937128956e0a24d60087b23985eed9b7e000.tar.gz qemu-c072937128956e0a24d60087b23985eed9b7e000.tar.bz2 qemu-c072937128956e0a24d60087b23985eed9b7e000.zip | |
Revert "Merge remote-tracking branch 'qemu-kvm/memory/batch' into staging"
This reverts commit 8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d, reversing
changes made to 444dc48298c480e42e15a8fe676be737d8a6b2a1.
From Avi:
Please revert the entire pull (git revert 8ef9ea85a2cc1) while I work this
out - it isn't trivial.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'Makefile.hw')
| -rw-r--r-- | Makefile.hw | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.hw b/Makefile.hw index 63eb7e40be..659e441992 100644 --- a/Makefile.hw +++ b/Makefile.hw @@ -10,7 +10,6 @@ include $(SRC_PATH)/rules.mak $(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw) QEMU_CFLAGS+=-I.. -QEMU_CFLAGS += $(GLIB_CFLAGS) include $(SRC_PATH)/Makefile.objs |