From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Dec 2012 02:09:18 +0000 (-0800)
Subject: Merge branches 'core-locking-for-linus' and 'timers-urgent-for-linus' of git://git... 
X-Git-Tag: MMI-PSA29.97-13-9~15436
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=de0c276b31538fcd56611132f20b63eae2891876;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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()
---

de0c276b31538fcd56611132f20b63eae2891876