tree 8ceefe56b6f325a4b8dbf0ee2dcda0d9216a52a3
parent 220a6258b1bac1f0b050a99aa8233330d6c8c416
parent c7cedb125ba20cc531671dc667ad704baa667d97
author Linus Torvalds <torvalds@linux-foundation.org> 1255559135 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1255559135 -0700

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

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  oprofile: warn on freeing event buffer too early
  oprofile: fix race condition in event_buffer free
  lockdep: Use cpu_clock() for lockstat