| commit | 9b6c4ea95ff87464e012f70b119601de9e94deac | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 16 08:31:55 2014 +0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 16 08:31:55 2014 +0700 |
| tree | 5dc1d4c9ea990bdf01a9f3c42965f9bc5bf0d47d | |
| parent | 93a11c8f5cc642571071a1609a83998db1373077 [diff] | |
| parent | 7a06c41cbec33c6dbe7eec575c61986122617408 [diff] |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull locking fixes from Ingo Molnar: "Two fixes from lockdep coverage of seqlocks, which fix deadlocks on lockdep-enabled ARM systems" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched_clock: Disable seqlock lockdep usage in sched_clock() seqlock: Use raw_ prefix instead of _no_lockdep