diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 11:42:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 11:42:38 -0800 |
| commit | 5fbd305dd2b661a243013cf444d2a32bfec2f701 (patch) | |
| tree | 4e90099fef21c0ad7aec77d772b12a0b2094d64e /include/linux/nfs_fs_sb.h | |
| parent | a205b082189bf914959a667a5c83ea145bba3fb5 (diff) | |
| parent | b1b73d095084e754562961c443aa8f6587a55f8e (diff) | |
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.
Diffstat (limited to 'include/linux/nfs_fs_sb.h')
0 files changed, 0 insertions, 0 deletions