]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fff8181 cc79b72 bd42e6a)
Merge branches 'core-fixes-for-linus' and 'timers-fixes-for-linus' of git://git.kerne...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Feb 2011 18:19:18 +0000 (10:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Feb 2011 18:19:18 +0000 (10:19 -0800)
commitb21385b3708173e2a852f07f68073c5be30dca9b
treea353228f47995e49fb450f5ff1a7bf5bd8020004tree | snapshot
parentfff8181068c73e6376d51ae19a1e5e8f72481747commit | diff
parentcc79b72af3040cccb2eb7dd8ff2c2fab19f18ba5commit | diff
parentbd42e6a6ff5104f872b52be7c2af90766c8e9c7ecommit | diff
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
Linux Kernel Source Tree.