]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 May 2012 22:35:09 +0000 (15:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 May 2012 22:35:09 +0000 (15:35 -0700)
Pull timer fix from Thomas Gleixner.

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  rtc: Fix possible null pointer dereference in rtc-mpc5121.c


Trivial merge