diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-03 08:52:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-03 08:52:05 -0800 |
| commit | eb487ab4d5af0caee81bfaaa5d87b55844f60145 (patch) | |
| tree | 5dc5470b73aeb1f4bfff9e77d52ff3387c18e7df /lib/show_mem.c | |
| parent | 0b0abeaf3d30cec03ac6497fe978b8f7edecc5ae (diff) | |
| parent | 542e72fc90f5ed9eecb574f80f70868c7f296093 (diff) | |
| download | op-kernel-dev-eb487ab4d5af0caee81bfaaa5d87b55844f60145.zip op-kernel-dev-eb487ab4d5af0caee81bfaaa5d87b55844f60145.tar.gz | |
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: Fix reading in perf_event_read()
watchdog: Don't change watchdog state on read of sysctl
watchdog: Fix sysctl consistency
watchdog: Fix broken nowatchdog logic
perf: Fix Pentium4 raw event validation
perf: Fix alloc_callchain_buffers()
Diffstat (limited to 'lib/show_mem.c')
0 files changed, 0 insertions, 0 deletions
