From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Feb 2011 18:19:18 +0000 (-0800)
Subject: Merge branches 'core-fixes-for-linus' and 'timers-fixes-for-linus' of git://git.kerne... 
X-Git-Url: https://git.karo-electronics.de/?p=mv-sheeva.git;a=commitdiff_plain;h=a1213b091cd50c3038b3ae480c2f1fae2713f010

Merge branches 'core-fixes-for-linus' and 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  Revert "lockdep, timer: Fix del_timer_sync() annotation"

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  timer debug: Hide kernel addresses via %pK in /proc/timer_list
---

a1213b091cd50c3038b3ae480c2f1fae2713f010