| commit | 8d71844b5194fee6edd49e68c01445266f364572 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Aug 03 09:58:20 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Aug 03 09:58:20 2014 -0700 |
| tree | 637d8292cc2b6530d33b53ede66cdc771514acc7 | |
| parent | 3f9c08f7ce2ca7b176dc7ee8dd287a82dfe53e60 [diff] | |
| parent | 504d58745c9ca28d33572e2d8a9990b43e06075d [diff] |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull timer fixes from Thomas Gleixner: "Two fixes in the timer area: - a long-standing lock inversion due to a printk - suspend-related hrtimer corruption in sched_clock" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: timer: Fix lock inversion between hrtimer_bases.lock and scheduler locks sched_clock: Avoid corrupting hrtimer tree during suspend