aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-12 21:51:51 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-12 21:51:51 -0500
commit775ba7ad491a154f99871fe603f03366e84ae159 (patch)
tree7112bd513ff7c60033f4ba07790cab8a7d3195a2 /Makefile
parentd9405057c18cdc62eade7106a774d87a3e080875 (diff)
parent18b36c7119aa868fdfae6855b86824db238e5ebc (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: Fix inotify maintainers entry Fix typo in new debug options. Jon needs a new shift key. fs: Convert kmalloc() + memset() to kzalloc() in fs/. configfs.h: Remove dead macro definitions. kconfig: Standardize "depends" -> "depends on" in Kconfig files e100: replace kmalloc with kcalloc um: replace kmalloc+memset with kzalloc fix typo in net/ipv4/ip_fragment.c include/linux/compiler.h: reject gcc 3 < gcc 3.2 Kconfig: fix spelling error in config KALLSYMS help text Remove duplicate "have to" in comment Fix small typo in drivers/serial/icom.c Use consistent casing in help message EXT{2,3,4}_FS: remove outdated part of the help text
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 73e825b39a08..4eabaa8afbff 100644
--- a/Makefile
+++ b/Makefile
@@ -1100,9 +1100,9 @@ boards := $(notdir $(boards))
1100 1100
1101help: 1101help:
1102 @echo 'Cleaning targets:' 1102 @echo 'Cleaning targets:'
1103 @echo ' clean - remove most generated files but keep the config and' 1103 @echo ' clean - Remove most generated files but keep the config and'
1104 @echo ' enough build support to build external modules' 1104 @echo ' enough build support to build external modules'
1105 @echo ' mrproper - remove all generated files + config + various backup files' 1105 @echo ' mrproper - Remove all generated files + config + various backup files'
1106 @echo ' distclean - mrproper + remove editor backup and patch files' 1106 @echo ' distclean - mrproper + remove editor backup and patch files'
1107 @echo '' 1107 @echo ''
1108 @echo 'Configuration targets:' 1108 @echo 'Configuration targets:'