From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 21 Jul 2006 19:03:32 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.18-rc3~78
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3bda2418b94243d5e43fcfe48d9de70cb0d2423e;p=karo-tx-linux.git

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [PATCH] spidernet: rework tx queue handling
  [PATCH] spidernet: bug fix for init code
  [PATCH] sky2: NAPI poll fix
  [NET] ethtool: fix oops by testing correct struct member
  e1000: bump version to 7.1.9-k4
  e1000: fix panic on large frame receive when mtu=default
  e1000: remove CRC bytes from measured packet length
  e1000: Redo netpoll fix to address community concerns
---

3bda2418b94243d5e43fcfe48d9de70cb0d2423e