| commit | b2464ab2023f20aea23ef8df1cb45b338c859ea5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 11 17:37:24 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 11 17:37:24 2010 -0700 |
| tree | f19c0b09cfb79559274e499e21ca7c29a8a3fdba | |
| parent | 788885ae7a298dec73ba999c2fc5d46d42072ddf [diff] | |
| parent | 829e92458532b1dbfeb972435d45bb060cdbf5a3 [diff] |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/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