]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 2 Feb 2007 16:13:23 +0000 (08:13 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 2 Feb 2007 16:13:23 +0000 (08:13 -0800)
commit7e5450827e48b23ae0ca8695f2aaf7d51b91e346
treeba97a19081f945d4ffe1f52be22cf03764265a62
parentc77bafb7517036221e28d99bc27c7b11511803c5
parentfb27474da0df847e5c6ffbed98123f1d9b2a8365
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