diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-19 09:43:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-19 09:43:19 -0700 |
| commit | d46c7d9ab8289f23a5e161060b84fd7e63de7921 (patch) | |
| tree | 347f049f3c3c9dcd0c8e9edd459d7d6b9bbacfaf /drivers/net/cnic.c | |
| parent | c124891f50f11e33acdfa276864ea089bab726b6 (diff) | |
| parent | b395cd8a74b4a8d943dd4b5585e676f62f7350b3 (diff) | |
Merge branch 'perfcounters-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perfcounters-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf tools: Make 'make html' work
perf annotate: Fix segmentation fault
perf_counter: Fix the PARISC build
perf_counter: Check task on counter read IPI
perf: Rename perf-examples.txt to examples.txt
perf record: Fix typo in pid_synthesize_comm_event
Diffstat (limited to 'drivers/net/cnic.c')
0 files changed, 0 insertions, 0 deletions