diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:38:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:38:49 -0500 |
| commit | 7c2db36e730ee4facd341679ecb21ee73ba92831 (patch) | |
| tree | 75016fba72aaf0581b9263f7fa4c565e6e634f3c /net | |
| parent | 8b5628ab83b671f96ac9f174c1bd51c92589fc82 (diff) | |
| parent | a47a376f1c025e23e836c0376813c0424de665c2 (diff) | |
Merge branch 'akpm' (incoming from Andrew)
Merge misc patches from Andrew Morton:
- Florian has vanished so I appear to have become fbdev maintainer
again :(
- Joel and Mark are distracted to welcome to the new OCFS2 maintainer
- The backlight queue
- Small core kernel changes
- lib/ updates
- The rtc queue
- Various random bits
* akpm: (164 commits)
rtc: rtc-davinci: use devm_*() functions
rtc: rtc-max8997: use devm_request_threaded_irq()
rtc: rtc-max8907: use devm_request_threaded_irq()
rtc: rtc-da9052: use devm_request_threaded_irq()
rtc: rtc-wm831x: use devm_request_threaded_irq()
rtc: rtc-tps80031: use devm_request_threaded_irq()
rtc: rtc-lp8788: use devm_request_threaded_irq()
rtc: rtc-coh901331: use devm_clk_get()
rtc: rtc-vt8500: use devm_*() functions
rtc: rtc-tps6586x: use devm_request_threaded_irq()
rtc: rtc-imxdi: use devm_clk_get()
rtc: rtc-cmos: use dev_warn()/dev_dbg() instead of printk()/pr_debug()
rtc: rtc-pcf8583: use dev_warn() instead of printk()
rtc: rtc-sun4v: use pr_warn() instead of printk()
rtc: rtc-vr41xx: use dev_info() instead of printk()
rtc: rtc-rs5c313: use pr_err() instead of printk()
rtc: rtc-at91rm9200: use dev_dbg()/dev_err() instead of printk()/pr_debug()
rtc: rtc-rs5c372: use dev_dbg()/dev_warn() instead of printk()/pr_debug()
rtc: rtc-ds2404: use dev_err() instead of printk()
rtc: rtc-efi: use dev_err()/dev_warn()/pr_err() instead of printk()
...
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index 3f2eb57cc51d..ed0b9e2e797a 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig | |||
| @@ -11,7 +11,7 @@ menuconfig IPV6 | |||
| 11 | You will still be able to do traditional IPv4 networking as well. | 11 | You will still be able to do traditional IPv4 networking as well. |
| 12 | 12 | ||
| 13 | For general information about IPv6, see | 13 | For general information about IPv6, see |
| 14 | <http://playground.sun.com/pub/ipng/html/ipng-main.html>. | 14 | <https://en.wikipedia.org/wiki/IPv6>. |
| 15 | For Linux IPv6 development information, see <http://www.linux-ipv6.org>. | 15 | For Linux IPv6 development information, see <http://www.linux-ipv6.org>. |
| 16 | For specific information about IPv6 under Linux, read the HOWTO at | 16 | For specific information about IPv6 under Linux, read the HOWTO at |
| 17 | <http://www.bieringer.de/linux/IPv6/>. | 17 | <http://www.bieringer.de/linux/IPv6/>. |