diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/appletalk/Kconfig | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/appletalk/Kconfig')
| -rw-r--r-- | drivers/net/appletalk/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig index 0a0e0cd81a23..f5a89164e779 100644 --- a/drivers/net/appletalk/Kconfig +++ b/drivers/net/appletalk/Kconfig | |||
| @@ -18,7 +18,7 @@ config ATALK | |||
| 18 | 18 | ||
| 19 | General information about how to connect Linux, Windows machines and | 19 | General information about how to connect Linux, Windows machines and |
| 20 | Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>. The | 20 | Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>. The |
| 21 | NET-3-HOWTO, available from | 21 | NET3-4-HOWTO, available from |
| 22 | <http://www.tldp.org/docs.html#howto>, contains valuable | 22 | <http://www.tldp.org/docs.html#howto>, contains valuable |
| 23 | information as well. | 23 | information as well. |
| 24 | 24 | ||