diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-03 17:52:05 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-03 17:52:05 +0100 |
commit | eb487ab4d5af0caee81bfaaa5d87b55844f60145 (patch) | |
tree | 5dc5470b73aeb1f4bfff9e77d52ff3387c18e7df /drivers/net/can/Kconfig | |
parent | Revert "exofs: Set i_mapping->backing_dev_info anyway" (diff) | |
parent | perf: Fix reading in perf_event_read() (diff) | |
download | linux-eb487ab4d5af0caee81bfaaa5d87b55844f60145.tar.xz linux-eb487ab4d5af0caee81bfaaa5d87b55844f60145.zip |
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 'drivers/net/can/Kconfig')
0 files changed, 0 insertions, 0 deletions