Changeset cfb79747 in mainline

Timestamp:

2012-02-14T22:06:15Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a31aad1

Parents:

199112e4 (diff), e10d41a (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 mainline changes.

Files:

• boot/Makefile.grub (modified) (view diffs)
• boot/Makefile.silo (modified) (view diffs)
• boot/Makefile.yaboot (modified) (view diffs)
• kernel/arch/abs32le/src/abs32le.c (modified) (view diffs)
• kernel/arch/amd64/include/interrupt.h (modified) (view diffs)
• kernel/arch/amd64/src/amd64.c (modified) (view diffs)
• kernel/arch/arm32/src/arm32.c (modified) (view diffs)
• kernel/arch/ia32/include/interrupt.h (modified) (view diffs)
• kernel/arch/ia32/src/ia32.c (modified) (view diffs)
• kernel/arch/ia32/src/mm/frame.c (modified) (view diffs)
• kernel/arch/ia64/include/interrupt.h (modified) (view diffs)
• kernel/arch/ia64/src/ia64.c (modified) (view diffs)
• tools/autotool.py (modified) (view diffs)
• uspace/app/trace/trace.c (modified) (view diffs)
• uspace/drv/bus/isa/isa.c (modified) (view diffs)
• uspace/drv/bus/isa/isa.dev (modified) (view diffs)
• uspace/drv/bus/isa/isa.ma (modified) (view diffs)
• uspace/drv/bus/pci/pciintel/pci.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/mouse/mousedev.c (modified) (view diffs)
• uspace/drv/char/i8042/buffer.h (modified) (view diffs)
• uspace/drv/char/i8042/i8042.c (modified) (view diffs)
• uspace/drv/char/i8042/i8042.h (modified) (view diffs)
• uspace/drv/char/i8042/main.c (modified) (view diffs)
• uspace/drv/char/ps2mouse/ps2mouse.c (modified) (view diffs)
• uspace/drv/char/ps2mouse/ps2mouse.h (modified) (view diffs)
• uspace/drv/char/xtkbd/xtkbd.c (modified) (view diffs)
• uspace/drv/char/xtkbd/xtkbd.h (modified) (view diffs)
• uspace/drv/nic/e1k/e1k.c (modified) (view diffs)
• uspace/drv/nic/e1k/e1k.h (modified) (view diffs)
• uspace/drv/nic/lo/lo.c (modified) (view diffs)
• uspace/drv/nic/ne2k/dp8390.c (modified) (view diffs)
• uspace/drv/nic/ne2k/dp8390.h (modified) (view diffs)
• uspace/drv/nic/ne2k/ne2k.c (modified) (view diffs)
• uspace/drv/nic/rtl8139/defs.h (modified) (view diffs)
• uspace/drv/nic/rtl8139/driver.c (modified) (view diffs)
• uspace/drv/nic/rtl8139/driver.h (modified) (view diffs)
• uspace/drv/nic/rtl8139/general.h (modified) (view diffs)
• uspace/lib/c/generic/device/nic.c (modified) (view diffs)
• uspace/lib/c/generic/loc.c (modified) (view diffs)
• uspace/lib/c/include/device/nic.h (modified) (view diffs)
• uspace/lib/c/include/ipc/devman.h (modified) (view diffs)
• uspace/lib/c/include/ipc/net.h (modified) (view diffs)
• uspace/lib/c/include/ipc/net_net.h (modified) (view diffs)
• uspace/lib/c/include/ipc/nil.h (modified) (view diffs)
• uspace/lib/c/include/net/device.h (modified) (view diffs)
• uspace/lib/c/include/nic/eth_phys.h (moved) (moved from uspace/lib/c/include/net/eth_phys.h ) (view diffs)
• uspace/lib/c/include/nic/nic.h (added)
• uspace/lib/drv/Makefile (modified) (view diffs)
• uspace/lib/drv/generic/driver.c (modified) (view diffs)
• uspace/lib/drv/generic/interrupt.c (added)
• uspace/lib/drv/generic/remote_nic.c (modified) (view diffs)
• uspace/lib/drv/include/ddf/driver.h (modified) (view diffs)
• uspace/lib/drv/include/ddf/interrupt.h (modified) (view diffs)
• uspace/lib/drv/include/ops/nic.h (modified) (view diffs)
• uspace/lib/drv/include/usbhc_iface.h (modified) (view diffs)
• uspace/lib/net/generic/net_checksum.c (modified) (view diffs)
• uspace/lib/net/generic/net_remote.c (modified) (view diffs)
• uspace/lib/net/include/net_checksum.h (modified) (view diffs)
• uspace/lib/net/include/net_interface.h (modified) (view diffs)
• uspace/lib/net/include/nil_remote.h (modified) (view diffs)
• uspace/lib/net/nil/nil_remote.c (modified) (view diffs)
• uspace/lib/nic/Makefile (modified) (view diffs)
• uspace/lib/nic/include/nic.h (modified) (view diffs)
• uspace/lib/nic/include/nic_driver.h (modified) (view diffs)
• uspace/lib/nic/include/nic_ev.h (added)
• uspace/lib/nic/include/nic_impl.h (modified) (view diffs)
• uspace/lib/nic/include/nic_rx_control.h (modified) (view diffs)
• uspace/lib/nic/include/nic_wol_virtues.h (modified) (view diffs)
• uspace/lib/nic/src/nic_driver.c (modified) (view diffs)
• uspace/lib/nic/src/nic_ev.c (added)
• uspace/lib/nic/src/nic_impl.c (modified) (view diffs)
• uspace/lib/nic/src/nic_rx_control.c (modified) (view diffs)
• uspace/lib/nic/src/nic_wol_virtues.c (modified) (view diffs)
• uspace/lib/posix/ctype.c (modified) (view diffs)
• uspace/srv/devman/devman.c (modified) (view diffs)
• uspace/srv/hid/input/generic/input.c (modified) (view diffs)
• uspace/srv/loc/loc.c (modified) (view diffs)
• uspace/srv/net/cfg/e1k.nic (modified) (view diffs)
• uspace/srv/net/cfg/lo.nic (modified) (view diffs)
• uspace/srv/net/cfg/ne2k.nic (modified) (view diffs)
• uspace/srv/net/net/Makefile (modified) (view diffs)
• uspace/srv/net/net/net.c (modified) (view diffs)
• uspace/srv/net/net/net.h (modified) (view diffs)
• uspace/srv/net/nil/eth/eth.c (modified) (view diffs)
• uspace/srv/net/nil/eth/eth.h (modified) (view diffs)
• uspace/srv/net/nil/nildummy/nildummy.c (modified) (view diffs)
• uspace/srv/net/nil/nildummy/nildummy.h (modified) (view diffs)