[riot-commits] [RIOT-OS/RIOT] f13ef5: * restructured cpu folder to distinguish between a...

Oleg Hahm oleg at hobbykeller.org
Tue Jul 30 11:12:42 CEST 2013


  Branch: refs/heads/master
  Home:   https://github.com/RIOT-OS/RIOT
  Commit: f13ef5f500a87f70310c8bc8c2effb4b64e31576
      https://github.com/RIOT-OS/RIOT/commit/f13ef5f500a87f70310c8bc8c2effb4b64e31576
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-03-31 (Sun, 31 Mar 2013)

  Changed paths:
    M Makefile.include
    M Makefile.modules
    M cpu/Makefile
    A cpu/Makefile.include
    M cpu/arm_common/arm_cpu.c
    R cpu/arm_common/hwtimer_cpu.c
    R cpu/arm_common/iap.c
    A cpu/lpc_common/Makefile
    A cpu/lpc_common/hwtimer_cpu.c
    A cpu/lpc_common/iap.c

  Log Message:
  -----------
  * restructured cpu folder to distinguish between arm and lpc common files


  Commit: efd73d735b2a3859f853694e226e6f38052dd7f5
      https://github.com/RIOT-OS/RIOT/commit/efd73d735b2a3859f853694e226e6f38052dd7f5
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-03-31 (Sun, 31 Mar 2013)

  Changed paths:
    A cpu/mc1322x/Makefile
    A cpu/mc1322x/include/cpu-conf.h
    A cpu/mc1322x/include/cpu.h
    A cpu/mc1322x/mc1322x.lds
    A cpu/mc1322x/start.s

  Log Message:
  -----------
  * initial not yet compiling(!) support for mc1322x


  Commit: cc68d7caa617466b641995631ea1d3261cfb1b8c
      https://github.com/RIOT-OS/RIOT/commit/cc68d7caa617466b641995631ea1d3261cfb1b8c
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-03-31 (Sun, 31 Mar 2013)

  Changed paths:
    M cpu/arm_common/syscalls.c

  Log Message:
  -----------
  * assuming size_t to be always unsigned


  Commit: 5ae8c46c883210b30e1181dc1c11655c71d54bc8
      https://github.com/RIOT-OS/RIOT/commit/5ae8c46c883210b30e1181dc1c11655c71d54bc8
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-03-31 (Sun, 31 Mar 2013)

  Changed paths:
    M cpu/Makefile.base
    R cpu/arm_common/profiling.c
    A cpu/lpc_common/profiling.c

  Log Message:
  -----------
  * moved profiling code to lpc specific part and added includes to cpu Makefile


  Commit: 2177b130d76c8f2fb5e35db1ef05ba8f02b76a70
      https://github.com/RIOT-OS/RIOT/commit/2177b130d76c8f2fb5e35db1ef05ba8f02b76a70
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-03-31 (Sun, 31 Mar 2013)

  Changed paths:
    A cpu/mc1322x/hwtimer_cpu.c
    M cpu/mc1322x/include/cpu.h
    A cpu/mc1322x/include/mc1322x.h
    M cpu/mc1322x/mc1322x.lds
    R cpu/mc1322x/start.s
    A cpu/mc1322x/startup.s

  Log Message:
  -----------
  * added header and preliminary hwtimer code for mc1322x
* renamed start to startup


  Commit: b6f21700ce76b9198f015ccd948a7534bc14ace0
      https://github.com/RIOT-OS/RIOT/commit/b6f21700ce76b9198f015ccd948a7534bc14ace0
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-04-01 (Mon, 01 Apr 2013)

  Changed paths:
    M core/kernel_init.c
    M core/thread.c
    M doc/doxygen/Makefile
    M sys/chardev_thread.c

  Log Message:
  -----------
  * clean up stuff (fix gcc warnings and added clean target for doc)


  Commit: 9556ca3e7c444c6647ce34be90b90159bebbc4d4
      https://github.com/RIOT-OS/RIOT/commit/9556ca3e7c444c6647ce34be90b90159bebbc4d4
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-04-01 (Mon, 01 Apr 2013)

  Changed paths:
    M cpu/arm_common/arm_cpu.c
    M cpu/arm_common/syscalls.c
    M cpu/lpc_common/hwtimer_cpu.c
    A cpu/lpc_common/lpc_cpu.c
    A cpu/lpc_common/lpc_syscalls.c

  Log Message:
  -----------
  * split up syscalls in arm and lpc specific code


  Commit: ce294b42493fcebeb07c9408fc8aa0c30b0188d6
      https://github.com/RIOT-OS/RIOT/commit/ce294b42493fcebeb07c9408fc8aa0c30b0188d6
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-04-01 (Mon, 01 Apr 2013)

  Changed paths:
    M cpu/mc1322x/hwtimer_cpu.c
    M cpu/mc1322x/include/cpu.h
    M cpu/mc1322x/include/mc1322x.h

  Log Message:
  -----------
  * changed to struct based register access for mc1322x


  Commit: 24300304f33af1b259bfa6a73717fa878c305339
      https://github.com/RIOT-OS/RIOT/commit/24300304f33af1b259bfa6a73717fa878c305339
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-04-01 (Mon, 01 Apr 2013)

  Changed paths:
    M cpu/mc1322x/mc1322x.lds
    M cpu/mc1322x/startup.s

  Log Message:
  -----------
  * added startup code for mc1322x


  Commit: 0add4cad211a23aaedd1276b58b897070934dcd3
      https://github.com/RIOT-OS/RIOT/commit/0add4cad211a23aaedd1276b58b897070934dcd3
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-04-01 (Mon, 01 Apr 2013)

  Changed paths:
    A cpu/mc1322x/cpu.c
    A cpu/mc1322x/mc1322x_syscalls.c

  Log Message:
  -----------
  * mc1322x specifics syscalls


  Commit: b0a3ae538226ac8ecff8a11710cbe2dc43d6a678
      https://github.com/RIOT-OS/RIOT/commit/b0a3ae538226ac8ecff8a11710cbe2dc43d6a678
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M cpu/msp430x16x/hwtimer_msp430.c

  Log Message:
  -----------
  Merge branch 'master' into mc1322x


  Commit: c39fd9d8dcb0f87518c1c94c5906ccdd9226fe1a
      https://github.com/RIOT-OS/RIOT/commit/c39fd9d8dcb0f87518c1c94c5906ccdd9226fe1a
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M Makefile.include
    M cpu/lpc2387/linkerscript.x

  Log Message:
  -----------
  * minor changes


  Commit: 3dba62afa6b1aacd1b88346378cb8ffbfaa1a3f8
      https://github.com/RIOT-OS/RIOT/commit/3dba62afa6b1aacd1b88346378cb8ffbfaa1a3f8
  Author: Thomas Eichinger <thomas.eichinger1 at gmail.com>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M Makefile.include
    M Makefile.modules
    M core/kernel_init.c
    M core/thread.c
    M cpu/Makefile
    M cpu/Makefile.base
    A cpu/Makefile.include
    M cpu/arm_common/arm_cpu.c
    R cpu/arm_common/hwtimer_cpu.c
    R cpu/arm_common/iap.c
    R cpu/arm_common/profiling.c
    M cpu/arm_common/syscalls.c
    M cpu/lpc2387/linkerscript.x
    A cpu/lpc_common/Makefile
    A cpu/lpc_common/hwtimer_cpu.c
    A cpu/lpc_common/iap.c
    A cpu/lpc_common/lpc_cpu.c
    A cpu/lpc_common/lpc_syscalls.c
    A cpu/lpc_common/profiling.c
    A cpu/mc1322x/Makefile
    A cpu/mc1322x/cpu.c
    A cpu/mc1322x/hwtimer_cpu.c
    A cpu/mc1322x/include/cpu-conf.h
    A cpu/mc1322x/include/cpu.h
    A cpu/mc1322x/include/mc1322x.h
    A cpu/mc1322x/mc1322x.lds
    A cpu/mc1322x/mc1322x_syscalls.c
    A cpu/mc1322x/startup.s
    M doc/doxygen/Makefile
    M sys/chardev_thread.c

  Log Message:
  -----------
  Merge branch 'mc1322x' of github.com:RIOT-OS/RIOT into mc1322x


  Commit: 64cbb25d3e6a16d71e01ca4e826c19153bad8cd8
      https://github.com/RIOT-OS/RIOT/commit/64cbb25d3e6a16d71e01ca4e826c19153bad8cd8
  Author: Thomas Eichinger <thomas.eichinger1 at gmail.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M cpu/mc1322x/hwtimer_cpu.c
    M cpu/mc1322x/startup.s

  Log Message:
  -----------
  * changed httimer_arch_init() to init all 4 timers and added implementation for hwtimer_arch_set


  Commit: abc80ba5e48ddbb425d8f0a52e566bcd8b45eb9c
      https://github.com/RIOT-OS/RIOT/commit/abc80ba5e48ddbb425d8f0a52e566bcd8b45eb9c
  Author: Thomas Eichinger <thomas.eichinger1 at gmail.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M cpu/mc1322x/hwtimer_cpu.c

  Log Message:
  -----------
  added implementation of htimer_arch_set_absolute()


  Commit: cc49d42f99f54ff168ca148a355e1ed2c36ed7e0
      https://github.com/RIOT-OS/RIOT/commit/cc49d42f99f54ff168ca148a355e1ed2c36ed7e0
  Author: Thomas Eichinger <thomas.eichinger1 at gmail.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M cpu/mc1322x/hwtimer_cpu.c

  Log Message:
  -----------
  added implementations for hwtimer_arch_unset() and hwtimer_arch_now()


  Commit: ee6d1e160418a1d09a4cdd1b1c4372e3cb210cae
      https://github.com/RIOT-OS/RIOT/commit/ee6d1e160418a1d09a4cdd1b1c4372e3cb210cae
  Author: Thomas Eichinger <thomas.eichinger1 at gmail.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M cpu/mc1322x/hwtimer_cpu.c
    M cpu/mc1322x/include/mc1322x.h

  Log Message:
  -----------
  implemented hwtimer_arch_(enable|disable)_interrupt() and added ITC definitions


  Commit: 7a489465bfb2a401876fb4e420096e0869ab9a00
      https://github.com/RIOT-OS/RIOT/commit/7a489465bfb2a401876fb4e420096e0869ab9a00
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    A foo

  Log Message:
  -----------
  * added testfile


  Commit: 92adb3e401dbb6ad02f39c67c9c6496eef9af9c6
      https://github.com/RIOT-OS/RIOT/commit/92adb3e401dbb6ad02f39c67c9c6496eef9af9c6
  Author: Thomas Eichinger <thomas.eichinger1 at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M cpu/mc1322x/hwtimer_cpu.c
    M cpu/mc1322x/include/mc1322x.h

  Log Message:
  -----------
  * added proper "struct TMR_struct*" in hwtimer_cpu.c
* removed dublicate definition of the UART structure in mc1322x.h


  Commit: 585f4f3698894fe7af4d62a39432c45efbeb9d31
      https://github.com/RIOT-OS/RIOT/commit/585f4f3698894fe7af4d62a39432c45efbeb9d31
  Author: Thomas Eichinger <thomas.eichinger1 at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M sys/include/transceiver.h
    M sys/transceiver/Makefile
    M sys/transceiver/transceiver.c

  Log Message:
  -----------
  embedded mc1322x radio API into transceiver.{c,h}


  Commit: 4bc89bd45889e843a6105a0810d15cbeb89093cd
      https://github.com/RIOT-OS/RIOT/commit/4bc89bd45889e843a6105a0810d15cbeb89093cd
  Author: Thomas Eichinger <thomas.eichinger1 at gmail.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M cpu/Makefile.include
    M cpu/mc1322x/mc1322x.lds
    M drivers/cc110x_ng/cc110x-rx.c
    M drivers/cc110x_ng/cc110x-tx.c
    M sys/net/sixlowpan/sixlowpan.c

  Log Message:
  -----------
  added fixes for compilation for mc1322x


  Commit: 0432a3eaf21ed8ba04694c25fe278fde06c63f4d
      https://github.com/RIOT-OS/RIOT/commit/0432a3eaf21ed8ba04694c25fe278fde06c63f4d
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    A foo

  Log Message:
  -----------
  * added testfile


  Commit: d3477fd747a1b4f800f8679380806722580c5bb4
      https://github.com/RIOT-OS/RIOT/commit/d3477fd747a1b4f800f8679380806722580c5bb4
  Author: Oleg Hahm <oleg at hobbykeller.org>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Log Message:
  -----------
  Merge branch 'master' of github.com:OlegHahm/RIOT


  Commit: 319f48c137fc052c68e8d0abe54fc0e282e440ba
      https://github.com/RIOT-OS/RIOT/commit/319f48c137fc052c68e8d0abe54fc0e282e440ba
  Author: Oleg Hahm <oleg at hobbykeller.org>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    R foo

  Log Message:
  -----------
  Revert "* added testfile"

This reverts commit 0432a3eaf21ed8ba04694c25fe278fde06c63f4d.


  Commit: 42001d8ddb03410477eb40820de17fe377e174c2
      https://github.com/RIOT-OS/RIOT/commit/42001d8ddb03410477eb40820de17fe377e174c2
  Author: Oleg Hahm <oleg at hobbykeller.org>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M cpu/mc1322x/cpu.c

  Log Message:
  -----------
  dummy lpm_set implementation


  Commit: e9cee715a19ab41971e63b28e53bac886609870c
      https://github.com/RIOT-OS/RIOT/commit/e9cee715a19ab41971e63b28e53bac886609870c
  Author: Oleg Hahm <oleg at hobbykeller.org>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M cpu/arm_common/Makefile

  Log Message:
  -----------
  Use basic CFLAGS for ARM bootloader code


  Commit: cce8f46e497cc499839ec22e48d9ab50f818db62
      https://github.com/RIOT-OS/RIOT/commit/cce8f46e497cc499839ec22e48d9ab50f818db62
  Author: Oleg Hahm <oleg at hobbykeller.org>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M sys/net/sixlowpan/sixlowborder.h
    M sys/net/sixlowpan/sixlowip.c
    M sys/net/sixlowpan/sixlowmac.c
    M sys/net/sixlowpan/sixlowmac.h
    M sys/net/sixlowpan/sixlownd.c
    M sys/net/sixlowpan/sixlowpan.c

  Log Message:
  -----------
  experimental sixlowpan fixes to eliminate multiple definitions


  Commit: 19e4034aceee52026da77d6a890b4ce772dc993d
      https://github.com/RIOT-OS/RIOT/commit/19e4034aceee52026da77d6a890b4ce772dc993d
  Author: Oleg Hahm <oleg at hobbykeller.org>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M Makefile.include
    M Makefile.modules
    M cpu/Makefile
    M cpu/Makefile.base
    A cpu/Makefile.include
    M cpu/arm_common/Makefile
    M cpu/arm_common/arm_cpu.c
    R cpu/arm_common/hwtimer_cpu.c
    R cpu/arm_common/iap.c
    R cpu/arm_common/profiling.c
    M cpu/arm_common/syscalls.c
    M cpu/lpc2387/linkerscript.x
    A cpu/lpc_common/Makefile
    A cpu/lpc_common/hwtimer_cpu.c
    A cpu/lpc_common/iap.c
    A cpu/lpc_common/lpc_cpu.c
    A cpu/lpc_common/lpc_syscalls.c
    A cpu/lpc_common/profiling.c
    A cpu/mc1322x/Makefile
    A cpu/mc1322x/cpu.c
    A cpu/mc1322x/hwtimer_cpu.c
    A cpu/mc1322x/include/cpu-conf.h
    A cpu/mc1322x/include/cpu.h
    A cpu/mc1322x/include/mc1322x.h
    A cpu/mc1322x/mc1322x.lds
    A cpu/mc1322x/mc1322x_syscalls.c
    A cpu/mc1322x/startup.s
    M doc/doxygen/Makefile
    M drivers/cc110x_ng/cc110x-rx.c
    M drivers/cc110x_ng/cc110x-tx.c
    M sys/chardev_thread.c
    M sys/include/transceiver.h
    M sys/net/sixlowpan/sixlowip.c
    M sys/net/sixlowpan/sixlowmac.c
    M sys/net/sixlowpan/sixlownd.c
    M sys/net/sixlowpan/sixlowpan.c
    M sys/transceiver/transceiver.c

  Log Message:
  -----------
  Merge branch 'thomas-mc1322x'

Conflicts:
	Makefile.modules
	core/kernel_init.c
	core/thread.c
	cpu/arm_common/arm_cpu.c
	cpu/arm_common/syscalls.c
	cpu/lpc_common/hwtimer_cpu.c
	cpu/lpc_common/iap.c
	sys/include/transceiver.h
	sys/net/sixlowpan/sixlowip.c
	sys/net/sixlowpan/sixlowmac.c
	sys/net/sixlowpan/sixlowmac.h
	sys/net/sixlowpan/sixlowpan.c
	sys/transceiver/Makefile
	sys/transceiver/transceiver.c


  Commit: f12d5628ebd2674309e70c612521656b35847684
      https://github.com/RIOT-OS/RIOT/commit/f12d5628ebd2674309e70c612521656b35847684
  Author: Oleg Hahm <oleg at hobbykeller.org>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M sys/include/transceiver.h
    M sys/transceiver/transceiver.c

  Log Message:
  -----------
  fixed transceiver for mc1322x


  Commit: 62975163711b2fbde83c656abeb6251a3f5c9872
      https://github.com/RIOT-OS/RIOT/commit/62975163711b2fbde83c656abeb6251a3f5c9872
  Author: Oleg Hahm <oleg at hobbykeller.org>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M Makefile.modules
    M cpu/Makefile.include
    M cpu/arm_common/arm_cpu.c
    M cpu/lpc_common/lpc_cpu.c
    M cpu/lpc_common/lpc_syscalls.c

  Log Message:
  -----------
  restructured and fixed arm architecutre files


  Commit: 6d488592692b0824a2c891def25da3667f21b8d4
      https://github.com/RIOT-OS/RIOT/commit/6d488592692b0824a2c891def25da3667f21b8d4
  Author: Oleg Hahm <oleg at hobbykeller.org>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M Makefile.include
    M Makefile.modules
    M cpu/Makefile
    M cpu/Makefile.base
    A cpu/Makefile.include
    M cpu/arm_common/Makefile
    M cpu/arm_common/arm_cpu.c
    R cpu/arm_common/hwtimer_cpu.c
    R cpu/arm_common/iap.c
    R cpu/arm_common/profiling.c
    M cpu/arm_common/syscalls.c
    M cpu/lpc2387/linkerscript.x
    A cpu/lpc_common/Makefile
    A cpu/lpc_common/hwtimer_cpu.c
    A cpu/lpc_common/iap.c
    A cpu/lpc_common/lpc_cpu.c
    A cpu/lpc_common/lpc_syscalls.c
    A cpu/lpc_common/profiling.c
    A cpu/mc1322x/Makefile
    A cpu/mc1322x/cpu.c
    A cpu/mc1322x/hwtimer_cpu.c
    A cpu/mc1322x/include/cpu-conf.h
    A cpu/mc1322x/include/cpu.h
    A cpu/mc1322x/include/mc1322x.h
    A cpu/mc1322x/mc1322x.lds
    A cpu/mc1322x/mc1322x_syscalls.c
    A cpu/mc1322x/startup.s
    M doc/doxygen/Makefile
    M drivers/cc110x_ng/cc110x-rx.c
    M drivers/cc110x_ng/cc110x-tx.c
    M sys/chardev_thread.c
    M sys/include/transceiver.h
    M sys/net/sixlowpan/sixlowip.c
    M sys/net/sixlowpan/sixlowmac.c
    M sys/net/sixlowpan/sixlownd.c
    M sys/net/sixlowpan/sixlowpan.c
    M sys/transceiver/transceiver.c

  Log Message:
  -----------
  Merge branch 'master' of github.com:OlegHahm/RIOT


  Commit: a2dff456f787a7fd49a44104a5edfe9644e15eca
      https://github.com/RIOT-OS/RIOT/commit/a2dff456f787a7fd49a44104a5edfe9644e15eca
  Author: Oleg Hahm <oleg at hobbykeller.org>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M Makefile.include
    M cpu/Makefile
    A cpu/Makefile.include
    M cpu/arm_common/arm_cpu.c
    R cpu/arm_common/hwtimer_cpu.c
    R cpu/arm_common/iap.c
    A cpu/lpc_common/Makefile
    A cpu/lpc_common/hwtimer_cpu.c
    A cpu/lpc_common/iap.c

  Log Message:
  -----------
  rebased from origin/master


  Commit: f7ecc704a47967a028ee9400fb5a5f995404f564
      https://github.com/RIOT-OS/RIOT/commit/f7ecc704a47967a028ee9400fb5a5f995404f564
  Author: Oleg Hahm <oleg at hobbykeller.org>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M Makefile.dep
    M core/Makefile
    M drivers/cc110x/Makefile
    M drivers/cc110x/cc1100-csmaca-mac.c
    M drivers/cc110x/cc1100.c
    M drivers/cc110x/cc1100_phy.c
    M sys/Makefile
    M sys/auto_init/Makefile
    M sys/net/sixlowpan/rpl/etx_beaconing.c
    M sys/net/sixlowpan/rpl/rpl.h
    M sys/net/sixlowpan/rpl/rpl_structs.h
    M sys/transceiver/Makefile

  Log Message:
  -----------
  fixed includes and include pathes


  Commit: 22c668529db5adf635606438516851fa7b5dd963
      https://github.com/RIOT-OS/RIOT/commit/22c668529db5adf635606438516851fa7b5dd963
  Author: Oleg Hahm <oleg at hobbykeller.org>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M Makefile.dep
    M core/Makefile
    M cpu/arm_common/arm_cpu.c
    M drivers/cc110x/Makefile
    M drivers/cc110x/cc1100-csmaca-mac.c
    M drivers/cc110x/cc1100.c
    M drivers/cc110x/cc1100_phy.c
    M sys/Makefile
    M sys/auto_init/Makefile
    M sys/net/sixlowpan/rpl/etx_beaconing.c
    M sys/net/sixlowpan/rpl/rpl.h
    M sys/net/sixlowpan/rpl/rpl_structs.h
    M sys/transceiver/Makefile

  Log Message:
  -----------
  Merge branch 'oleg-master' into mymaster

Conflicts:
	cpu/Makefile.include
	cpu/arm_common/arm_cpu.c


  Commit: fa83bb4fd149a06ad971c3ce0b505a7d16d37d28
      https://github.com/RIOT-OS/RIOT/commit/fa83bb4fd149a06ad971c3ce0b505a7d16d37d28
  Author: Oleg Hahm <oleg at hobbykeller.org>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    A keyword_space.sed

  Log Message:
  -----------
  sed parameters for additional style checks


Compare: https://github.com/RIOT-OS/RIOT/compare/0bd81f14a42e...fa83bb4fd149


More information about the commits mailing list