summaryrefslogtreecommitdiffstats
path: root/include/linux/if_bonding.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-04-05 04:55:58 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-04-05 04:55:58 +0000
commit74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch)
tree7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /include/linux/if_bonding.h
parentee6374c8b0d333c08061c6a97bc77090d7461225 (diff)
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to switch to another getty like getty_ps. This commit also includes a fix for a setitimer bug which did prevent getty_ps from working on older kernels.
Diffstat (limited to 'include/linux/if_bonding.h')
-rw-r--r--include/linux/if_bonding.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/if_bonding.h b/include/linux/if_bonding.h
index d077aeb57..791127363 100644
--- a/include/linux/if_bonding.h
+++ b/include/linux/if_bonding.h
@@ -9,7 +9,7 @@
* (c) Copyright 1999, Thomas Davis, tadavis@lbl.gov
*
* This software may be used and distributed according to the terms
- * of the GNU Public License, incorporated herein by reference.
+ * of the GNU General Public License, incorporated herein by reference.
*
*/