Merge commit '68aa7c3'
authorReto Achermann <reto.achermann@inf.ethz.ch>
Mon, 12 Jan 2015 15:28:22 +0000 (16:28 +0100)
committerReto Achermann <reto.achermann@inf.ethz.ch>
Mon, 12 Jan 2015 15:28:22 +0000 (16:28 +0100)
commit65e37925b60863724046efaea4e6e607701a86c4
treee6d9b4c4f15e09ad24493bb2e2f9b3dc2bc42226
parent98ce08315735d48e588eaa33a24f3beea2386b9d
parent68aa7c3656121d39d0782bab8ce4f02b4d450b20
Merge commit '68aa7c3'

Conflicts:
hake/RuleDefs.hs
hake/ArchDefaults.hs
hake/RuleDefs.hs
kernel/arch/x86_64/syscall.c