Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Dec 2012 02:18:58 +0000 (18:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Dec 2012 02:18:58 +0000 (18:18 -0800)
commitda830e589a45f0c42eef6f3cbd07275f8893f181
treeb241c86b8a0f9acdef4b90f69ddd200548e91f2c
parent090f8ccba37034cec5a5972a70abeaae7eb0222b
parent08cd2a6960ae2e1aa7f44b44ebafa84f503a2dd1
Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "These are late-v3.7 pending fixes for tracing."

Fix up trivial conflict in kernel/trace/ring_buffer.c: the NULL pointer
fix clashed with the change of type of the 'ret' variable.

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  ring-buffer: Fix race between integrity check and readers
  ring-buffer: Fix NULL pointer if rb_set_head_page() fails
  ftrace: Clear bits properly in reset_iter_read()
kernel/trace/ftrace.c
kernel/trace/ring_buffer.c