diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2010-11-28 12:24:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2010-11-28 12:24:20 -0800 |
| commit | 75f5d2c9bd36047364d1fb35c0720ab37df3be02 (patch) | |
| tree | 20f7bfba3397366e0f4526dcdbdb20f23559d8a5 /kernel/perf_event.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff) | |
| parent | firewire: net: throttle TX queue before running out of tlabels (diff) | |
| download | linux-75f5d2c9bd36047364d1fb35c0720ab37df3be02.tar.gz linux-75f5d2c9bd36047364d1fb35c0720ab37df3be02.tar.bz2 linux-75f5d2c9bd36047364d1fb35c0720ab37df3be02.zip | |
Merge branch 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: net: throttle TX queue before running out of tlabels
firewire: net: replace lists by counters
firewire: net: fix memory leaks
firewire: net: count stats.tx_packets and stats.tx_bytes
Diffstat (limited to 'kernel/perf_event.c')
0 files changed, 0 insertions, 0 deletions