diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 13:21:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 13:21:22 -0800 |
| commit | 98793265b429a3f0b3f1750e74d67cd4d740d162 (patch) | |
| tree | b0bd717673f0c21845cf053f3fb6b75d42530af5 /net/ipv4/Kconfig | |
| parent | b4a133da2eaccb844a7beaef16ffd9c76a0d21d3 (diff) | |
| parent | bd1b2a555952d959f47169056fca05acf7eff81f (diff) | |
| download | linux-rpi3-98793265b429a3f0b3f1750e74d67cd4d740d162.tar.gz linux-rpi3-98793265b429a3f0b3f1750e74d67cd4d740d162.tar.bz2 linux-rpi3-98793265b429a3f0b3f1750e74d67cd4d740d162.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
Kconfig: acpi: Fix typo in comment.
misc latin1 to utf8 conversions
devres: Fix a typo in devm_kfree comment
btrfs: free-space-cache.c: remove extra semicolon.
fat: Spelling s/obsolate/obsolete/g
SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
tools/power turbostat: update fields in manpage
mac80211: drop spelling fix
types.h: fix comment spelling for 'architectures'
typo fixes: aera -> area, exntension -> extension
devices.txt: Fix typo of 'VMware'.
sis900: Fix enum typo 'sis900_rx_bufer_status'
decompress_bunzip2: remove invalid vi modeline
treewide: Fix comment and string typo 'bufer'
hyper-v: Update MAINTAINERS
treewide: Fix typos in various parts of the kernel, and fix some comments.
clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
leds: Kconfig: Fix typo 'D2NET_V2'
sound: Kconfig: drop unknown symbol ARCH_CLPS7500
...
Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
Diffstat (limited to 'net/ipv4/Kconfig')
| -rw-r--r-- | net/ipv4/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 1a8f93bd2d4f..335ca7abbd46 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -163,8 +163,6 @@ config IP_PNP_RARP operating on your network. Read <file:Documentation/filesystems/nfs/nfsroot.txt> for details. -# not yet ready.. -# bool ' IP: ARP support' CONFIG_IP_PNP_ARP config NET_IPIP tristate "IP: tunneling" select INET_TUNNEL |