Merge remote-tracking branch 'swicki/master'
authorKornilios Kourtis <kkourt@inf.ethz.ch>
Mon, 12 May 2014 12:08:32 +0000 (14:08 +0200)
committerKornilios Kourtis <kkourt@inf.ethz.ch>
Mon, 12 May 2014 12:08:32 +0000 (14:08 +0200)
commit247d88dbd543f836e4f05d3fb3383f03ce75cdc3
treef22c31e74833f8e80d50db8e340753b8a2023109
parent821785cc8fa98465b81e76124bd41ab3cde5253a
parent5f3304d5c0abf946fe47cd59901ca5e34d2e1e76
Merge remote-tracking branch 'swicki/master'

Conflicts:
hake/menu.lst.pandaboard
include/arch/arm/omap44xx/device_registers.h
kernel/arch/arm/exec.c
usr/kaluga/main.c
usr/kaluga/omap_startup.c
devices/Hakefile
hake/menu.lst.pandaboard
hake/symbolic_targets.mk
include/arch/arm/omap44xx/device_registers.h
kernel/Hakefile
kernel/arch/arm/exec.c
kernel/arch/armv7/syscall.c
usr/kaluga/main.c
usr/kaluga/omap_startup.c