GitHub PushEvent at 2014-09-17 01:04:09
Repository: rtems-gsoc2014
Actor: heshamelmatary
Payload: {"shas":[["aa97fafbaa965d26a46ef10194a872d83ddb3863","e986ec72cdb33ead261e22d8aecc2301b0c6f581@gmail.com","Merge branch 'master' of https://github.com/RTEMS/rtems\n\nConflicts:\n\tc/src/lib/libbsp/or1k/or1ksim/Makefile.am\n\tc/src/lib/libbsp/or1k/or1ksim/clock/clockdrv.c\n\tc/src/lib/libbsp/or1k/or1ksim/configure.ac\n\tc/src/lib/libbsp/or1k/or1ksim/console/console-config.c\n\tc/src/lib/libbsp/or1k/or1ksim/console/uart.c\n\tc/src/lib/libbsp/or1k/or1ksim/include/bsp.h\n\tc/src/lib/libbsp/or1k/or1ksim/include/irq.h\n\tc/src/lib/libbsp/or1k/or1ksim/include/or1ksim.h\n\tc/src/lib/libbsp/or1k/or1ksim/include/uart.h\n\tc/src/lib/libbsp/or1k/or1ksim/irq/irq.c\n\tc/src/lib/libbsp/or1k/or1ksim/preinstall.am\n\tc/src/lib/libbsp/or1k/or1ksim/start/start.S\n\tc/src/lib/libbsp/or1k/or1ksim/startup/linkcmds\n\tc/src/lib/libbsp/or1k/or1ksim/timer/timer.c\n\tc/src/lib/libbsp/or1k/preinstall.am\n\tcpukit/score/cpu/or1k/rtems/score/or1k-utility.h","Hesham ALMatary",true]],"size":1,"ref":"refs/heads/master","head":"aa97fafbaa965d26a46ef10194a872d83ddb3863"}