| commit | c9192798b9318a4b3f96c41ae27805cc8b46b7ee | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 15 09:50:03 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 15 09:50:03 2010 -0700 |
| tree | cd943e4e7641c53797fc2918c8230a7f959a071b | |
| parent | 1bbee7d616d5fdffa6c1c86075dbffe2b3e236ea [diff] | |
| parent | f13d4f979c518119bba5439dd2364d76d31dcd3f [diff] |
Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: hrtimer: Preserve timer state in remove_hrtimer()