Merge branch 'master' into master-into-distops
authorSimon Gerber <simon.gerber@inf.ethz.ch>
Mon, 3 Mar 2014 12:24:52 +0000 (13:24 +0100)
committerSimon Gerber <simon.gerber@inf.ethz.ch>
Mon, 3 Mar 2014 12:24:52 +0000 (13:24 +0100)
commitced990a1901922bfae3177df774d6dc1f93fc118
tree686c0f6231d8a53f2af759c40d9e61fcb078f23a
parentbc704ee7939a46cbb39c3ba4bf8491fb33f5adbc
parent4c7217250e2ca76d8c3fc8349e2fb92ed615e007
Merge branch 'master' into master-into-distops

Conflicts:
kernel/capabilities.c
errors/errno.fugu
kernel/Hakefile
kernel/capabilities.c
kernel/paging_generic.c