Merge branches 'core-locking-for-linus' and 'timers-urgent-for-linus' of git://git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Dec 2012 02:09:18 +0000 (18:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Dec 2012 02:09:18 +0000 (18:09 -0800)
commitde0c276b31538fcd56611132f20b63eae2891876
treef46b45fee74d0789a094ba8cda4797d4317d0219
parent608ff1a210ab0e8b969399039bf8e18693605910
parent99fb4a122e96203dfd6c67d99d908aafd20f4753
parent351f181f9134d71efd46ddf0c0abca31b58cd79b
Merge branches 'core-locking-for-linus' and 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull trivial fix branches from Ingo Molnar.

Cleanup in __get_key_name, and a timer comment fixlet.

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  lockdep: Use KSYM_NAME_LEN'ed buffer for __get_key_name()

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timers, sched: Correct the comments for tick_sched_timer()
kernel/time/tick-sched.c