History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree updates from Jiri Kosina: "Usual rocket science stuff from trivial.git" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) neighbour.h: fix comment sched: Fix warning on make htmldocs caused by wait.h slab: struct kmem_cache is protected by slab_mutex doc: Fix typo in USB Gadget Documentation of/Kconfig: Spelling s/one/once/ mkregtable: Fix sscanf handling lp5523, lp8501: comment improvements thermal: rcar: comment spelling treewide: fix comments and printk msgs IXP4xx: remove '1 &&' from a condition check in ixp4xx_restart() Documentation: update /proc/uptime field description Documentation: Fix size parameter for snprintf arm: fix comment header and macro name asm-generic: uaccess: Spelling s/a ny/any/ mtd: onenand: fix comment header doc: driver-model/platform.txt: fix a typo drivers: fix typo in DEVTMPFS_MOUNT Kconfig help text doc: Fix typo (acces_process_vm -> access_process_vm) treewide: Fix typos in printk drivers/gpu/drm/qxl/Kconfig: reformat the help text ...

Linus Torvalds committed 12 years ago

Commit bb1281f2 parents 4988abf c04e7da76 files · +102 −113Browse files

Showing the changes to include/uapi/linux (1 of 76 files). Show all

Unified · Split

include/uapi/linux/neighbour.h+1−1
@@ -58,7 +58,7 @@ enum { · 57 unmodified lines
5858
5959 /* NUD_NOARP & NUD_PERMANENT are pseudostates, they never change
6060 and make no address resolution or NUD.
61− NUD_PERMANENT is also cannot be deleted by garbage collectors.
61+ NUD_PERMANENT also cannot be deleted by garbage collectors.
6262 */
6363
6464 struct nda_cacheinfo {