git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-at91rm9200
/
at91rm9200_time.c
diff --git
a/arch/arm/mach-at91rm9200/time.c
b/arch/arm/mach-at91rm9200/at91rm9200_time.c
similarity index 98%
rename from
arch/arm/mach-at91rm9200/time.c
rename to
arch/arm/mach-at91rm9200/at91rm9200_time.c
index f2f080350ccb6d45a7db45dcda1d19e0c64121fc..dc38e06ada6376d67952f3e8b97848338701acf7 100644
(file)
--- a/
arch/arm/mach-at91rm9200/time.c
+++ b/
arch/arm/mach-at91rm9200/at91rm9200_time.c
@@
-1,5
+1,5
@@
/*
- * linux/arch/arm/mach-at91rm9200/time.c
+ * linux/arch/arm/mach-at91rm9200/
at91rm9200_
time.c
*
* Copyright (C) 2003 SAN People
* Copyright (C) 2003 ATMEL