]> git.karo-electronics.de Git - mv-sheeva.git/commit
projects / mv-sheeva.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1cecd79 7ff2079 f590308)
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)
commita1213b091cd50c3038b3ae480c2f1fae2713f010
treea353228f47995e49fb450f5ff1a7bf5bd8020004tree | snapshot
parent1cecd791f2708b621e619cf4df4636c97c9497e5commit | diff
parent7ff207928eb0761fa6b6c39eda82ac07a5241acfcommit | diff
parentf590308536db432e4747f562b29e5858123938e9commit | 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 for Marvell Sheeva based platforms