| commit | 6e35c24b9f5b2f68732910d2138bc0eb1b477ab1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Jan 24 07:42:31 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Jan 24 07:42:31 2007 -0800 |
| tree | 350c60fc080ec1f6dee8c1eb4c37aee7ee0cfce9 | |
| parent | d0f29485686d9d1c4f31240953a742d5dd4fdb72 [diff] | |
| parent | e47b207a5bcb73bb097f94d9fe364f50737b0eb2 [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: mv643xx_eth: Fix race condition in mv643xx_eth_free_tx_descs s2io bogus memset