| commit | 643d2d7992f4ce4f983d455b579f77b1e9c0af0c | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 31 May 2011 11:32:54 +0000 (31 20:32 +0900) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 31 May 2011 11:32:54 +0000 (31 20:32 +0900) | ||
| tree | ebd1421f10881ba0da431a3c05fc0f31feb15176 | treesnapshot (tar.gz zip) |
| parent | 89c122236e60747f920008c9cf4e9cbde3333e50 | commitdiff |
| parent | 89e1be50c68eb5e58b873dce87bbac627ee18d1f | commitdiff |
Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Put back -pg to tsc.o and add no GCOV to vread_tsc_64.o
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Put back -pg to tsc.o and add no GCOV to vread_tsc_64.o