The following commit has been merged in the linux branch: commit ee67e6cbe1121da1ae4eceb7b2bcb535c5cbf65e Merge: 220a6258b1bac1f0b050a99aa8233330d6c8c416 c7cedb125ba20cc531671dc667ad704baa667d97 Author: Linus Torvalds torvalds@linux-foundation.org Date: Wed Oct 14 15:25:35 2009 -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