diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-17 03:58:25 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-17 03:58:25 -0400 |
| commit | bb3c3e807140816b5f5fd4840473ee52a916ad4f (patch) | |
| tree | 9e8a69d266a7df86ca16177eefffab4b4e910753 /arch/x86/Makefile | |
| parent | 595c36490deb49381dc51231a3d5e6b66786ed27 (diff) | |
| parent | 012abeea669ea49636cf952d13298bb68654146a (diff) | |
Merge commit 'v2.6.32-rc5' into perf/probes
Conflicts:
kernel/trace/trace_event_profile.c
Merge reason: update to -rc5 and resolve conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Makefile')
| -rw-r--r-- | arch/x86/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 4aefc034e9a0..ba7a6df4db92 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile | |||
| @@ -182,8 +182,8 @@ archclean: | |||
| 182 | define archhelp | 182 | define archhelp |
| 183 | echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' | 183 | echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' |
| 184 | echo ' install - Install kernel using' | 184 | echo ' install - Install kernel using' |
| 185 | echo ' (your) ~/bin/installkernel or' | 185 | echo ' (your) ~/bin/$(INSTALLKERNEL) or' |
| 186 | echo ' (distribution) /sbin/installkernel or' | 186 | echo ' (distribution) /sbin/$(INSTALLKERNEL) or' |
| 187 | echo ' install to $$(INSTALL_PATH) and run lilo' | 187 | echo ' install to $$(INSTALL_PATH) and run lilo' |
| 188 | echo ' fdimage - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)' | 188 | echo ' fdimage - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)' |
| 189 | echo ' fdimage144 - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)' | 189 | echo ' fdimage144 - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)' |