Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Dec 2011 19:41:17 +0000 (11:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Dec 2011 19:41:17 +0000 (11:41 -0800)
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  oprofile: Fix uninitialized memory access when writing to writing to oprofilefs


Trivial merge