From: yang <yang.zhang@arm.com>
Date: Wed, 24 Oct 2012 08:34:56 +0000 (+0800)
Subject: Merge branch 'master' of git://github.com/projectNe10/Ne10 into license
X-Git-Tag: v1.0.0~21^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a1bb1ebe9df5542713ef0fb595f0d2d302478924;p=platform%2Fupstream%2Fne10.git

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

Conflicts:
	README.txt
---

a1bb1ebe9df5542713ef0fb595f0d2d302478924
diff --cc README.txt
index 72eba20,b0e5286..4e76e6e
--- a/README.txt
+++ b/README.txt
@@@ -1,5 -1,4 +1,4 @@@
- 
 -Copyright (c) 2011-12, ARM Limited
 +Copyright 2012 ARM Limited
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without