| commit | 222335b755726f539c4a056ce119e017aa4166c4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Feb 02 08:13:23 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Feb 02 08:13:23 2007 -0800 |
| tree | ba97a19081f945d4ffe1f52be22cf03764265a62 | |
| parent | 7a1864222425ece571886ec0216b3e7056496514 [diff] | |
| parent | a55eb05a57a981f16325d035ee3a3ad10485ea0d [diff] |
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