aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-18 00:38:27 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-18 00:38:27 -0400
commit49dc2b7173010792c6923930ffcee84b7094b7de (patch)
tree439899abc82e7413b3bee6d52823d5350d7f2245 /drivers/rtc
parentd66435cc7da95964cb386674bd82ec12ca66320a (diff)
parentd00cd819d7dfb1a24d814457f47ff4d6c7be152c (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: drivers/rtc: broken link fix drm/i915 Fix typos in i915_gem_fence.c Docs: fix missing word in REPORTING-BUGS lib+mm: fix few spelling mistakes MAINTAINERS: add git URL for APM driver treewide: Fix typo in printk
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-rx8025.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c
index b69647e0be23..9f105efbc546 100644
--- a/drivers/rtc/rtc-rx8025.c
+++ b/drivers/rtc/rtc-rx8025.c
@@ -7,7 +7,7 @@
7 * All rights reserved. 7 * All rights reserved.
8 * 8 *
9 * Modified by fengjh at rising.com.cn 9 * Modified by fengjh at rising.com.cn
10 * <http://lists.lm-sensors.org/mailman/listinfo/lm-sensors> 10 * <lm-sensors@lm-sensors.org>
11 * 2006.11 11 * 2006.11
12 * 12 *
13 * Code cleanup by Sergei Poselenov, <sposelenov@emcraft.com> 13 * Code cleanup by Sergei Poselenov, <sposelenov@emcraft.com>