Merge branch 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux...

* 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timer: Use debugobjects to catch deletion of uninitialized timers
  timer: Setup uninitialized timer with a stub callback
  debugobjects: Extend to assert that an object is initialized
  debugobjects: Be smarter about static objects

diff --cc kernel/timer.c
Simple merge