From: Andrew Morton <akpm@linux-foundation.org>

Cc: Andi Kleen <ak@novell.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/binfmt_elf.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN Documentation/feature-removal-schedule.txt~deprecate-aout-elf-interpreters-fix Documentation/feature-removal-schedule.txt
diff -puN fs/binfmt_elf.c~deprecate-aout-elf-interpreters-fix fs/binfmt_elf.c
--- a/fs/binfmt_elf.c~deprecate-aout-elf-interpreters-fix
+++ a/fs/binfmt_elf.c
@@ -744,7 +744,8 @@ static int load_elf_binary(struct linux_
 
 		if (interpreter_type == INTERPRETER_AOUT && warn < 10) {
 			printk(KERN_WARNING "a.out ELF interpreter %s is "
-	"deprecated and will not be supported anymore\n", elf_interpreter);
+				"deprecated and will not be supported "
+				"after Linux 2.6.25\n", elf_interpreter);
 			warn++;
 		}
 
_