| commit | efab03d998da03f67836ffc664b04e0400f85448 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Mar 29 13:22:07 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Mar 29 13:22:07 2007 -0700 |
| tree | 75ca0a8c5147c2b5bb7c226fd4f6e4cd6d8684cb | |
| parent | 9415fddd99e12d57640774a3043a809140245c40 [diff] | |
| parent | d8d79201eb391ae0eca05f9e51f1f94ab42b6b4e [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: NetXen: Fix hardware access for ppc architecture. sis190: new PHY support atl1: save mac address on remove