| commit | 0e402c6ec4f32a9192a30c4a5b5ba6867c0be7bc | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue May 15 18:46:25 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue May 15 18:46:25 2007 -0700 |
| tree | 2edb86443cc241585aab2c789e2c1c2d711363b5 | |
| parent | 28aa483f80d146a8f117eb65a4fddf31d58230d7 [diff] | |
| parent | 4e19b5c193454ade8d86468077078f680d121979 [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: ucc_geth: eliminate max-speed, change interface-type to phy-connection-type smc911x: fix compilation breakage pasemi_mac: Fix local-mac-address parsing pasemi_mac: Terminate PCI ID list pasemi_mac: Interrupt ack fixes pasemi_mac: Fix register defines