diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 09:39:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 09:39:05 -0800 |
| commit | cf10b2853f86e714eac7117484c0d368ce710fa4 (patch) | |
| tree | 6f1574a9de786c8c345ac852eff12d65b2d75bfe /Documentation | |
| parent | 14591de147f7c9656fa2b9c05680d2b46e286c40 (diff) | |
| parent | 166c3436d683cfe5316c7723ed746a93db053f12 (diff) | |
| download | talos-obmc-linux-cf10b2853f86e714eac7117484c0d368ce710fa4.tar.gz talos-obmc-linux-cf10b2853f86e714eac7117484c0d368ce710fa4.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/bonding.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt index b0fe41da007b..8d8b4e5ea184 100644 --- a/Documentation/networking/bonding.txt +++ b/Documentation/networking/bonding.txt @@ -945,7 +945,6 @@ bond0 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 collisions:0 txqueuelen:0 eth0 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 - inet addr:XXX.XXX.XXX.YYY Bcast:XXX.XXX.XXX.255 Mask:255.255.252.0 UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1 RX packets:3573025 errors:0 dropped:0 overruns:0 frame:0 TX packets:1643167 errors:1 dropped:0 overruns:1 carrier:0 @@ -953,7 +952,6 @@ eth0 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 Interrupt:10 Base address:0x1080 eth1 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 - inet addr:XXX.XXX.XXX.YYY Bcast:XXX.XXX.XXX.255 Mask:255.255.252.0 UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1 RX packets:3651769 errors:0 dropped:0 overruns:0 frame:0 TX packets:1643480 errors:0 dropped:0 overruns:0 carrier:0 |
