Merge branch 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Nov 2010 20:24:20 +0000 (12:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Nov 2010 20:24:20 +0000 (12:24 -0800)
commit75f5d2c9bd36047364d1fb35c0720ab37df3be02
tree20f7bfba3397366e0f4526dcdbdb20f23559d8a5
parent0f639a3c5ca63dd76ee07de9b02ebf0178ce9a17
parentb2268830f5cf29d94b3e4a2af0b795a8f28776fe
Merge branch 'fwnet' of git://git./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