Changeset c2b2de7 in mainline for boot/arch

Timestamp:

2012-10-17T22:17:29Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

150a2718

Parents:

6454ad47 (diff), 57912af3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge changes from bbxm branch

File:

• boot/arch/amd64/Makefile.inc (modified) (1 diff)

boot/arch/amd64/Makefile.inc

@@ -42 +42 @@
         char/ps2mouse \
         char/xtkbd \
+        time/cmos-rtc \
         bus/usb/ehci\
         bus/usb/ohci \