| commit | 40a963502cd44765a0e0d45ff3409051986b5a39 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 29 15:08:53 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 29 15:08:53 2011 -0700 |
| tree | d9894efb7db009b23a91b22adbde4105fe80899b | |
| parent | fcc4dc715113999c6c7b5d3087fade3ee8d0f6eb [diff] | |
| parent | 2bce5daca28346f19c190dbdb5542c9fe3e8c6e6 [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: perf, x86, nmi: Move LVT un-masking into irq handlers perf events, x86: Work around the Nehalem AAJ80 erratum perf, x86: Fix BTS condition ftrace: Build without frame pointers on Microblaze