diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 15:54:53 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 16:01:40 -0400 |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/rtc | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-sa1100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index dbd07c31042a..29f98a70586e 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | * | 9 | * |
| 10 | * Modifications from: | 10 | * Modifications from: |
| 11 | * CIH <cih@coventive.com> | 11 | * CIH <cih@coventive.com> |
| 12 | * Nicolas Pitre <nico@cam.org> | 12 | * Nicolas Pitre <nico@fluxnic.net> |
| 13 | * Andrew Christian <andrew.christian@hp.com> | 13 | * Andrew Christian <andrew.christian@hp.com> |
| 14 | * | 14 | * |
| 15 | * Converted to the RTC subsystem and Driver Model | 15 | * Converted to the RTC subsystem and Driver Model |