Merge branch 'master' into distops
authorSimon Gerber <simon.gerber@inf.ethz.ch>
Wed, 3 Dec 2014 19:09:35 +0000 (20:09 +0100)
committerSimon Gerber <simon.gerber@inf.ethz.ch>
Wed, 3 Dec 2014 19:09:35 +0000 (20:09 +0100)
1  2 
kernel/arch/x86_64/syscall.c

Simple merge