diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 18:09:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 18:09:18 -0800 |
| commit | de0c276b31538fcd56611132f20b63eae2891876 (patch) | |
| tree | f46b45fee74d0789a094ba8cda4797d4317d0219 /kernel | |
| parent | 608ff1a210ab0e8b969399039bf8e18693605910 (diff) | |
| parent | 99fb4a122e96203dfd6c67d99d908aafd20f4753 (diff) | |
| parent | 351f181f9134d71efd46ddf0c0abca31b58cd79b (diff) | |
Merge branches 'core-locking-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/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()