Merge remote-tracking branch 'origin/master' into shoal
authorReto Achermann <reto.achermann@inf.ethz.ch>
Fri, 5 Dec 2014 08:54:20 +0000 (09:54 +0100)
committerReto Achermann <reto.achermann@inf.ethz.ch>
Fri, 5 Dec 2014 08:54:20 +0000 (09:54 +0100)
commite35ffd0b81d1599f9eb0367fd637c09fb988b8c6
treed2dc476ceec3b4fe2df27bda06aec3ca9caef537
parent954bd3bed05a96c07395f03032ac139e1b58eef8
parent69694a244d07c15baf944aa9c941bb2a82104780
Merge remote-tracking branch 'origin/master' into shoal

Conflicts:
kernel/arch/k1om/vmkit.c
kernel/arch/x86_64/syscall.c
usr/kaluga/start_cpu.c
hake/symbolic_targets.mk
kernel/arch/x86_64/syscall.c
lib/vfs/vfs_fat.c
usr/drivers/cpuboot/common.c