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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-at91
/
include
/
mach
/
at91_wdt.h
diff --git
a/arch/arm/mach-at91/include/mach/at91_wdt.h
b/arch/arm/mach-at91/include/mach/at91_wdt.h
index 973b4526a98eec11a6e1defc3b3f4ada3e42f446..fecc2e9f0ca8254d51e932f77efeac07cc204119 100644
(file)
--- a/
arch/arm/mach-at91/include/mach/at91_wdt.h
+++ b/
arch/arm/mach-at91/include/mach/at91_wdt.h
@@
-1,6
+1,9
@@
/*
* arch/arm/mach-at91/include/mach/at91_wdt.h
*
+ * Copyright (C) 2007 Andrew Victor
+ * Copyright (C) 2007 Atmel Corporation.
+ *
* Watchdog Timer (WDT) - System peripherals regsters.
* Based on AT91SAM9261 datasheet revision D.
*