From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 2 Feb 2007 16:13:23 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.20~14
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=222335b755726f539c4a056ce119e017aa4166c4;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:
  spidernet : fix memory leak in spider_net_stop
  e100: fix napi ifdefs removing needed code
  netxen patches
---

222335b755726f539c4a056ce119e017aa4166c4