summaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v32
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-20 20:42:38 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-20 20:42:38 +0100
commit5fbd305dd2b661a243013cf444d2a32bfec2f701 (patch)
tree4e90099fef21c0ad7aec77d772b12a0b2094d64e /arch/cris/arch-v32
parentMerge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff)
parenttime/clocksource: Fix kernel-doc warnings (diff)
downloadlinux-5fbd305dd2b661a243013cf444d2a32bfec2f701.tar.xz
linux-5fbd305dd2b661a243013cf444d2a32bfec2f701.zip
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 'arch/cris/arch-v32')
0 files changed, 0 insertions, 0 deletions