Changeset ea28272 in mainline for kernel/generic

Timestamp:

2010-12-30T13:43:27Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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:

kernel/generic

Files:

• include/adt/hash_table.h (modified) (view diffs)
• include/console/console.h (modified) (view diffs)
• include/console/kconsole.h (modified) (view diffs)
• include/ddi/ddi.h (modified) (view diffs)
• include/ddi/device.h (modified) (view diffs)
• include/ddi/irq.h (modified) (view diffs)
• include/ipc/event.h (modified) (view diffs)
• include/ipc/ipc.h (modified) (view diffs)
• include/ipc/ipcrsc.h (modified) (view diffs)
• include/ipc/irq.h (modified) (view diffs)
• include/ipc/sysipc.h (modified) (view diffs)
• include/mm/as.h (modified) (view diffs)
• include/mm/frame.h (modified) (view diffs)
• include/proc/program.h (modified) (view diffs)
• include/proc/task.h (modified) (view diffs)
• include/proc/thread.h (modified) (view diffs)
• include/security/cap.h (modified) (view diffs)
• include/synch/futex.h (modified) (view diffs)
• include/synch/smc.h (modified) (view diffs)
• include/syscall/syscall.h (modified) (view diffs)
• include/sysinfo/sysinfo.h (modified) (view diffs)
• include/time/clock.h (modified) (view diffs)
• include/typedefs.h (modified) (view diffs)
• include/udebug/udebug.h (modified) (view diffs)
• include/udebug/udebug_ops.h (modified) (view diffs)
• src/adt/hash_table.c (modified) (view diffs)
• src/console/cmd.c (modified) (view diffs)
• src/console/console.c (modified) (view diffs)
• src/console/kconsole.c (modified) (view diffs)
• src/ddi/ddi.c (modified) (view diffs)
• src/ddi/device.c (modified) (view diffs)
• src/ddi/irq.c (modified) (view diffs)
• src/interrupt/interrupt.c (modified) (view diffs)
• src/ipc/event.c (modified) (view diffs)
• src/ipc/ipc.c (modified) (view diffs)
• src/ipc/ipcrsc.c (modified) (view diffs)
• src/ipc/irq.c (modified) (view diffs)
• src/ipc/kbox.c (modified) (view diffs)
• src/ipc/sysipc.c (modified) (view diffs)
• src/lib/memstr.c (modified) (view diffs)
• src/lib/rd.c (modified) (view diffs)
• src/mm/as.c (modified) (view diffs)
• src/mm/slab.c (modified) (view diffs)
• src/proc/program.c (modified) (view diffs)
• src/proc/task.c (modified) (view diffs)
• src/proc/thread.c (modified) (view diffs)
• src/security/cap.c (modified) (view diffs)
• src/synch/futex.c (modified) (view diffs)
• src/synch/smc.c (modified) (view diffs)
• src/syscall/syscall.c (modified) (view diffs)
• src/sysinfo/stats.c (modified) (view diffs)
• src/sysinfo/sysinfo.c (modified) (view diffs)
• src/time/clock.c (modified) (view diffs)
• src/udebug/udebug.c (modified) (view diffs)
• src/udebug/udebug_ipc.c (modified) (view diffs)
• src/udebug/udebug_ops.c (modified) (view diffs)