projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0f639a3
b226883
)
Merge branch 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 28 Nov 2010 20:24:20 +0000
(12:24 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 28 Nov 2010 20:24:20 +0000
(12:24 -0800)
* '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
Trivial merge