Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 May 2010 00:37:24 +0000 (17:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 May 2010 00:37:24 +0000 (17:37 -0700)
commitb2464ab2023f20aea23ef8df1cb45b338c859ea5
treef19c0b09cfb79559274e499e21ca7c29a8a3fdba
parent788885ae7a298dec73ba999c2fc5d46d42072ddf
parent829e92458532b1dbfeb972435d45bb060cdbf5a3
Merge branch 'perf-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  kprobes/x86: Fix removed int3 checking order
  perf: Fix static strings treated like dynamic ones