diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-29 09:02:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-29 09:02:20 +0100 |
| commit | 9de09ace8d518141a4375e1d216ab64db4377799 (patch) | |
| tree | da8e7a77f4ea91eb3bb73fc6da72ecf8c99e1c16 /arch/blackfin/include/asm/nand.h | |
| parent | 1beee96bae0daf7f491356777c3080cc436950f5 (diff) | |
| parent | 6d3f1e12f46a2f9a1bb7e7aa433df8dd31ce5647 (diff) | |
| download | op-kernel-dev-9de09ace8d518141a4375e1d216ab64db4377799.zip op-kernel-dev-9de09ace8d518141a4375e1d216ab64db4377799.tar.gz | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up fixes and move base from -rc1 to -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/include/asm/nand.h')
| -rw-r--r-- | arch/blackfin/include/asm/nand.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/blackfin/include/asm/nand.h b/arch/blackfin/include/asm/nand.h index afbaafa..3ae8b56 100644 --- a/arch/blackfin/include/asm/nand.h +++ b/arch/blackfin/include/asm/nand.h @@ -1,13 +1,9 @@ -/* linux/include/asm-blackfin/nand.h - * - * Copyright (c) 2007 Analog Devices, Inc. - * Bryan Wu <bryan.wu@analog.com> - * +/* * BF5XX - NAND flash controller platfrom_device info * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * Copyright 2007-2008 Analog Devices, Inc. + * + * Licensed under the GPL-2 */ /* struct bf5xx_nand_platform |
