From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Dec 2012 02:18:58 +0000 (-0800)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~76
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da830e589a45f0c42eef6f3cbd07275f8893f181;p=pandora-kernel.git

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()
---

da830e589a45f0c42eef6f3cbd07275f8893f181
Reading git-diff-tree failed