Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 12 Oct 2007 16:17:22 +0000 (09:17 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 12 Oct 2007 16:17:22 +0000 (09:17 -0700)
commit000233e4d1321e54033d097e98f6868b11614217
tree2e25104862039bb95a1f82a9e19e2150aa0daffa
parentbfab36e81611e60573b84eb4e4b4c8d8545b2320
parent6dee6421581d3484e9a01d403dbf158161942db6
Merge branch 'master' of git://git./linux/kernel/git/davem/net-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  [BNX2]: Refine napi poll loop.
  [TG3]: Refine napi poll loop.