Merge commit '3c5ad8e' into update_old_avalon_20130513 · c084d0985e - THC的仓库

Merge commit '3c5ad8e' into update_old_avalon_20130513

Conflicts:
	driver-avalon.c

Luke Dashjr 13 years ago

parent

4522ee3c50 3c5ad8e44b

commit

c084d0985e

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
driver-avalon.c
							 
								View File
							
				@@ -1,5 +1,6 @@
			
				 /*
			
				  * Copyright 2012-2013 Xiangfu
			
				+ * Copyright 2013 Con Kolivas <kernel@kolivas.org>
			
				  * Copyright 2012 Luke Dashjr
			
				  * Copyright 2012 Andrew Smith
			
				  *