1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8327d0df..e3ddd615 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-18  Li Guanglei <guanglei@cn.ibm.com>
+
+	* tapset/tskschedule.stp: deleted, merge into scheduler.stp
+	* tapset/scheduler.stp:   incorporate tskschedule.stp
+	* testsuite/buildok/tskschedule.stp: deleted, merge into 
+	  sched_test.stp
+	* testsuite/buildok/sched_test.stp: incorporate tskschedule.stp
+
 2006-05-17  Josh Stone  <joshua.i.stone@intel.com>
 
 	* testsuite/buildok/sched_test.stp: test scheduler tapset