diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:29:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:29:34 -0800 |
| commit | 26a9ba160f50115ece48198608002600914932a7 (patch) | |
| tree | bcbc9be816e0282c0e33822b897489ca74a3e54f /fs/proc/meminfo.c | |
| parent | 13b5892672073b1169b3b60b8a57123fb32c9df1 (diff) | |
| parent | c10edee2e1716f8cf217cf52ed01ae4742fcdf3c (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 tools: Fix permission checks
perf_events: Fix some typo in the perf events config description
Diffstat (limited to 'fs/proc/meminfo.c')
0 files changed, 0 insertions, 0 deletions