Merge branch 'master' of git://github.com/projectNe10/Ne10

author yang <yang.zhang@arm.com>

Mon, 29 Oct 2012 08:38:05 +0000 (16:38 +0800)

committer yang <yang.zhang@arm.com>

Mon, 29 Oct 2012 08:38:05 +0000 (16:38 +0800)
author yang <yang.zhang@arm.com>
Mon, 29 Oct 2012 08:38:05 +0000 (16:38 +0800)
committer yang <yang.zhang@arm.com>
Mon, 29 Oct 2012 08:38:05 +0000 (16:38 +0800)
diff --cc inc/NE10_types.h
Simple merge
diff --cc modules/CMakeLists.txt
Simple merge
author	yang <yang.zhang@arm.com>
	Mon, 29 Oct 2012 08:38:05 +0000 (16:38 +0800)
committer	yang <yang.zhang@arm.com>
	Mon, 29 Oct 2012 08:38:05 +0000 (16:38 +0800)
		1	2
inc/NE10_types.h	patch \|	diff1 \|	diff2 \|	blob \| history
modules/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history