tree 3b149f6bc23b85914112d9dca9d81cb19ea41a3c
parent e2a1b9ee2335c35e0e34c88a024481b194b3c9cc
parent 54f2c841fa0007e5fee3b7d01a911c774f0a6cda
author Linus Torvalds <torvalds@linux-foundation.org> 1243374483 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1243374483 -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: fix cpu buffer size