summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-17 21:24:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-17 21:24:31 -0700
commitdfe91c9766578f2ec24ebf53b7fd07e288f170d1 (patch)
treeeaba385eabb22b366825464335cf44a774628863 /fs
parent3f8476fe892c58c0583f98f17e98fd67c3fec466 (diff)
parentd80238bbcad33218c8d34662f144dfb146c2d57b (diff)
downloadlinux-dfe91c9766578f2ec24ebf53b7fd07e288f170d1.tar.gz
Merge tag 'rtc-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull rtc fixes from Alexandre Belloni: "A few fixes for the RTC susbsystem for 4.2. The mt6397 driver was introduce in 4.2 so it is worth fixing before the final release. I though the compilation warning for armada38x was fixed by akpm in commit f98b733e93e0 ("rtc-armada38x.c: remove unused local `flags'") but he actually missed some occurrences of the variables. Since I received 4 patches for that, I think we can include it now. Summary: - fix mt6397 wakealarm creation - remove a compilation warning for armada38x that was forgotten" * tag 'rtc-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: rtc: armada38x: Remove unused variable from armada38x_rtc_set_time() rtc: mt6397: enable wakeup before registering rtc device
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions