| commit | 7af5f532a23c421ab9a70b1a9a78c722d26d95ff | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Wed, 27 Jun 2007 16:59:52 +0000 (27 09:59 -0700) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Wed, 27 Jun 2007 16:59:52 +0000 (27 09:59 -0700) | ||
| tree | 5487ef8e4484e2f8cdc4792d07a76669ca53d0e0 | treesnapshot (tar.gz zip) |
| parent | 67a32be082035bfc126849df38a8772a96f3e5c0 | commitdiff |
| parent | f9046eb3f64db73f1c5b2a25d2a5983351cd1a04 | commitdiff |
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
2.6.22: ERROR: "__ucmpdi2" [drivers/net/s2io.ko] undefined!
cxgb3 - fix register to stop bc/mc traffic
au1000_eth: Fix warnings.
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
2.6.22: ERROR: "__ucmpdi2" [drivers/net/s2io.ko] undefined!
cxgb3 - fix register to stop bc/mc traffic
au1000_eth: Fix warnings.