diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-10-18 01:09:09 +0200 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2009-10-18 01:12:33 +0200 |
| commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
| tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /arch/blackfin/include/asm/flat.h | |
| parent | dca2d6ac09d9ef59ff46820d4f0c94b08a671202 (diff) | |
| parent | f39cdf25bf77219676ec5360980ac40b1a7e144a (diff) | |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'arch/blackfin/include/asm/flat.h')
| -rw-r--r-- | arch/blackfin/include/asm/flat.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/blackfin/include/asm/flat.h b/arch/blackfin/include/asm/flat.h index 733a178d782d..c1314c56dd18 100644 --- a/arch/blackfin/include/asm/flat.h +++ b/arch/blackfin/include/asm/flat.h @@ -1,8 +1,9 @@ /* - * include/asm-blackfin/flat.h -- uClinux flat-format executables + * uClinux flat-format executables * - * Copyright (C) 2003, + * Copyright 2003-2009 Analog Devices Inc. * + * Licensed under the GPL-2 */ #ifndef __BLACKFIN_FLAT_H__ |