| commit | 7d0bab9dfecb3717f7e704b60a9f11631cb6636e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 15 19:52:12 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 15 19:52:12 2010 -0800 |
| tree | 57d23b51502649499784fcf3741091f40b366bda | |
| parent | 0aa2ca9ae1e08d11661abb00ae6e75ff885448d6 [diff] | |
| parent | b9c3032277f756e73f6c673419dc414155e04e46 [diff] |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: hrtimer, softirq: Fix hrtimer->softirq trampoline