]> rtime.felk.cvut.cz Git - frescor/frsh.git/commit
Merge branch 'master' of git://rtime.felk.cvut.cz/frescor/frsh_forb/dario
authorMichal Sojka <sojkam1@fel.cvut.cz>
Sun, 10 May 2009 16:15:59 +0000 (18:15 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Sun, 10 May 2009 18:14:14 +0000 (20:14 +0200)
commitcba6f9b8726b0e0231da5ca5270588f2af4481f3
tree92c434ae12926fac59bc6a5c0e2783585bf4854e
parentc59984e89270d09b469ef536b89a37be6057e250
parentcf67e44021dba4b36eeca33c4621e9d744a405d7
Merge branch 'master' of git://rtime.felk.cvut.cz/frescor/frsh_forb/dario

Conflicts:
frsh_api/Makefile.omk
frsh_api/frsh_contract.c
frsh_api/frsh_power.c
resources/acpi_cpu/Makefile.omk
resources/acpi_lcd/Makefile.omk
frsh_api/frsh_contract.c
frsh_api/frsh_power.c
resources/acpi_cpu/Makefile.omk
resources/acpi_lcd/Makefile.omk
resources/acpi_lcd/fra_acpi_lcd.h
resources/cpu_aquosa/lib/aqcpu_fra.c