tree 13b5fc4e7036b4226d94bd33aefb74a3dbb25b6a
parent 8123d8f17d8ba9d67e556688e4f025456ca97842
parent 4726f2a617ebd868a4fdeb5679613b897e5f1676
author Linus Torvalds <torvalds@linux-foundation.org> 1274195855 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1274195855 -0700

Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: Reduce stack_trace usage
  lockdep: No need to disable preemption in debug atomic ops
  lockdep: Actually _dec_ in debug_atomic_dec
  lockdep: Provide off case for redundant_hardirqs_on increment
  lockdep: Simplify debug atomic ops
  lockdep: Fix redundant_hardirqs_on incremented with irqs enabled
  lockstat: Make lockstat counting per cpu
  i8253: Convert i8253_lock to raw_spinlock