tree 4e90099fef21c0ad7aec77d772b12a0b2094d64e
parent a205b082189bf914959a667a5c83ea145bba3fb5
parent b1b73d095084e754562961c443aa8f6587a55f8e
author Linus Torvalds <torvalds@linux-foundation.org> 1324410158 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1324410158 -0800

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  time/clocksource: Fix kernel-doc warnings
  rtc: m41t80: Workaround broken alarm functionality
  rtc: Expire alarms after the time is set.