Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
commit299297c63686948aab5af1534629a0a740af6688
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 May 2009 21:48:03 +0000 (26 14:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 May 2009 21:48:03 +0000 (26 14:48 -0700)
tree3b149f6bc23b85914112d9dca9d81cb19ea41a3c
parente2a1b9ee2335c35e0e34c88a024481b194b3c9cc
parent54f2c841fa0007e5fee3b7d01a911c774f0a6cda
Merge branch 'core-fixes-for-linus' of git://git./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