]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a205b08 b1b73d0)
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Dec 2011 19:42:38 +0000 (11:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Dec 2011 19:42:38 +0000 (11:42 -0800)
commit5fbd305dd2b661a243013cf444d2a32bfec2f701
tree4e90099fef21c0ad7aec77d772b12a0b2094d64etree
parenta205b082189bf914959a667a5c83ea145bba3fb5commit | diff
parentb1b73d095084e754562961c443aa8f6587a55f8ecommit | 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.
Ubuntu Disco kernel mirror for Proxmox VE and PMG