| commit | d6f2fe98ebc2dd8f3e9926673e0d8acd2c764e71 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon May 21 17:45:25 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon May 21 17:45:25 2007 -0700 |
| tree | 009356baa16941facc8df7e057b78c0397093013 | |
| parent | 04fc5fd39e09c460fd478ea84b34c445dd376759 [diff] | |
| parent | 2053ed02a62f2c66d9cb9b51aea0836a7d8dbabf [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: Add constant for FCS/CRC length (frame check sequence) declance: Remove a dangling spin_unlock_irq() thingy e1000: Don't enable polling in open() (was: e1000: assertion hit in e1000_clean(), kernel 2.6.21.1)