| commit | a1213b091cd50c3038b3ae480c2f1fae2713f010 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 15 10:19:18 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 15 10:19:18 2011 -0800 |
| tree | a353228f47995e49fb450f5ff1a7bf5bd8020004 | |
| parent | 1cecd791f2708b621e619cf4df4636c97c9497e5 [diff] | |
| parent | 7ff207928eb0761fa6b6c39eda82ac07a5241acf [diff] | |
| parent | f590308536db432e4747f562b29e5858123938e9 [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