| commit | 3e2ab46df697048e222cdc046a2fa97149ca32ba | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Sep 22 15:37:31 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Sep 22 15:37:31 2006 -0700 |
| tree | f0b53afc6054853f7281b833d2d6b9ed48ed2b19 | |
| parent | e6e5fee1426bef07f4e6c3c76f48343c14207938 [diff] | |
| parent | 54caf44da31995df1f51174468fd9e83ca5c67a2 [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: [netdrvr] mv643xx_eth: fix obvious typo, which caused build breakage [netdrvr] lp486e: fix typo