]> Pileus Git - ~andy/linux/commitdiff
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jan 2014 01:31:55 +0000 (08:31 +0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jan 2014 01:31:55 +0000 (08:31 +0700)
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


Trivial merge