--- a/ChangeLog	Mon Jan 05 11:37:36 2009 +0000
+++ b/ChangeLog	Mon Jan 05 11:42:35 2009 +0000
@@ -1,3 +1,23 @@
+2009-01-05  Andrew Haley  <aph@redhat.com>
+
+	* Makefile.am (ICEDTEA_PATCHES): Fix bad checkin.
+
+2008-12-24  Andrew Haley  <aph@redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
+	(SharkFunction::initialize): Work around bug in
+	ciTypeFlow::Block::pre_order_at().
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp 
+	(SharkCompiler::compile_method): Allow "*" as a wildcard.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp (llvm::IRBuilder):
+	type2aelembytes now a mamber function.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.hpp (class
+	SharkBlock): is_private_copy renamed is_backedge_copy.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp (SharkBlock::parse):
+	force_bci if there's a trap.
+	* ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp: Delete
+	everything.
+
 2008-12-24  Omair Majid  <omajid@redhat.com>
 
 	* patches/icedtea-a11y-property-change.patch: New file.

--- a/Makefile.am	Mon Jan 05 11:37:36 2009 +0000
+++ b/Makefile.am	Mon Jan 05 11:42:35 2009 +0000
@@ -554,12 +554,6 @@
 
 ICEDTEA_FSG_PATCHES =
 
-DISTRIBUTION_PATCHES = \
-	patches/mixtec-assertions.patch \
-	patches/mixtec-no-log-vm-output.patch \
-	patches/mixtec-no-print-vm-options.patch \
-	patches/mixtec-optimization.patch
-
 ICEDTEA_PATCHES = \
 	$(ZERO_PATCHES_COND) \
 	patches/icedtea-version.patch \