Anas Nashif 85fb2e1445 remove merge conflict ... Change-Id: Iff634d72838a3975d62b6977b9e7fe5d32a2d6de Signed-off-by: Anas Nashif <anas.nashif@intel.com>		2016-02-05 20:14:21 -05:00
arch	Rename *.s files to *.S	2016-02-05 20:14:21 -05:00
config
doc	remove merge conflict	2016-02-05 20:14:21 -05:00
drivers	Rename *.s files to *.S	2016-02-05 20:14:21 -05:00
include	x86/bsp: move PIC (i8259) driver to drivers/interrupt_controller	2016-02-05 20:14:20 -05:00
kernel	Rename enlist_timeout(), delist_timeout(), and force_timeout() APIs	2016-02-05 20:14:20 -05:00
lib/libc
misc
net	net: Add kconf for networking	2016-02-05 20:14:20 -05:00
samples	Kbuild: Assembly code extension.	2016-02-05 20:14:20 -05:00
scripts	Kbuild: Assembly code extension.	2016-02-05 20:14:20 -05:00
shared/include/nanokernel/x86
.gitattributes
.gitignore	Remove obsolete .gitignore entry	2016-02-05 20:14:20 -05:00
.mailmap
Kconfig	Rename Tiny Mountain -> Zephyr OS	2016-02-05 20:14:20 -05:00
Makefile	Kbuild: Assembly code extension.	2016-02-05 20:14:20 -05:00
Makefile.inc
zephyr-env.sh