Changeset 520acaf in mainline for uspace

Timestamp:

2012-06-06T21:13:29Z (14 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

5f679702

Parents:

11b9ad7 (diff), 3123d2a (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

Location:

uspace

Files:

• app/tester/hw/misc/virtchar1.c (modified) (view diffs)
• app/trace/proto.h (modified) (view diffs)
• drv/bus/usb/ehci/res.c (modified) (view diffs)
• drv/bus/usb/uhci/res.c (modified) (view diffs)
• lib/c/generic/inet.c (modified) (view diffs)
• lib/c/generic/inetcfg.c (modified) (view diffs)
• lib/c/generic/inetping.c (modified) (view diffs)
• lib/c/generic/iplink.c (modified) (view diffs)
• lib/c/generic/net/socket_client.c (modified) (view diffs)
• lib/drv/generic/driver.c (modified) (view diffs)
• lib/drv/generic/interrupt.c (modified) (view diffs)
• lib/drv/generic/log.c (modified) (view diffs)
• lib/drv/include/ddf/driver.h (modified) (view diffs)
• lib/drv/include/ddf/interrupt.h (modified) (view diffs)
• lib/drv/include/ops/hw_res.h (modified) (view diffs)
• lib/drv/include/ops/nic.h (modified) (view diffs)
• lib/nic/include/nic.h (modified) (view diffs)
• lib/nic/include/nic_impl.h (modified) (view diffs)
• lib/nic/src/nic_driver.c (modified) (view diffs)
• lib/posix/stdbool.h (modified) (view diffs)
• lib/usb/include/usb/ddfiface.h (modified) (view diffs)
• lib/usb/include/usb/debug.h (modified) (view diffs)
• lib/usb/src/ddfiface.c (modified) (view diffs)
• lib/usb/src/hc.c (modified) (view diffs)
• lib/usbdev/include/usb/dev/driver.h (modified) (view diffs)
• lib/usbdev/include/usb/dev/hub.h (modified) (view diffs)
• lib/usbdev/include/usb/dev/recognise.h (modified) (view diffs)
• lib/usbdev/src/altiface.c (modified) (view diffs)
• lib/usbdev/src/hub.c (modified) (view diffs)
• lib/usbdev/src/recognise.c (modified) (view diffs)
• lib/usbhid/src/hidiface.c (modified) (view diffs)
• lib/usbhost/include/usb/host/hcd.h (modified) (view diffs)
• lib/usbhost/include/usb/host/usb_transfer_batch.h (modified) (view diffs)
• lib/usbhost/src/iface.c (modified) (view diffs)
• lib/usbvirt/src/device.c (modified) (view diffs)
• srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• srv/bd/file_bd/file_bd.c (modified) (view diffs)
• srv/bd/gxe_bd/gxe_bd.c (modified) (view diffs)
• srv/bd/part/guid_part/guid_part.c (modified) (view diffs)
• srv/bd/rd/rd.c (modified) (view diffs)
• srv/clipboard/clipboard.c (modified) (view diffs)
• srv/devman/devman.h (modified) (view diffs)
• srv/devman/main.c (modified) (view diffs)
• srv/hid/console/console.c (modified) (view diffs)
• srv/hid/fb/fb.c (modified) (view diffs)
• srv/hid/input/ctl/kbdev.c (modified) (view diffs)
• srv/hid/input/generic/input.c (modified) (view diffs)
• srv/hid/input/port/adb.c (modified) (view diffs)
• srv/hid/input/proto/mousedev.c (modified) (view diffs)
• srv/hid/remcons/remcons.c (modified) (view diffs)
• srv/hid/remcons/telnet.h (modified) (view diffs)
• srv/hid/remcons/user.h (modified) (view diffs)
• srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• srv/loader/main.c (modified) (view diffs)
• srv/locsrv/locsrv.c (modified) (view diffs)
• srv/locsrv/locsrv.h (modified) (view diffs)
• srv/net/ethip/ethip.c (modified) (view diffs)
• srv/net/ethip/ethip_nic.c (modified) (view diffs)
• srv/net/inetsrv/inetsrv.c (modified) (view diffs)
• srv/net/loopip/loopip.c (modified) (view diffs)
• srv/net/tcp/sock.c (modified) (view diffs)
• srv/net/udp/sock.c (modified) (view diffs)
• srv/ns/ns.c (modified) (view diffs)
• srv/vfs/vfs.c (modified) (view diffs)