- merge revision 1.11
authorMark Huang <mlhuang@cs.princeton.edu>
Mon, 15 Nov 2004 17:58:05 +0000 (17:58 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Mon, 15 Nov 2004 17:58:05 +0000 (17:58 +0000)
commit72d5b3b92956d4a05f24d8f995567e4842b7c3b9
tree1591b25d3807d5d9a427bbcff20d32c58c160a72
parent183e08e6bbfcfe1b0bdb2978bb1b36c4b3bfc09f
- merge revision 1.11
date: 2004/11/09 16:48:52;  author: mef;  state: Exp;  lines: +1 -2
Turned off CKRM memory controller.
Waiting for PL2899 to be resolved, which involves waiting for the
CKRM/IBM folks.
configs/kernel-2.6.8-i686-planetlab.config