diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /arch/arm/plat-omap/include/mach/mtd-xip.h | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'arch/arm/plat-omap/include/mach/mtd-xip.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/mtd-xip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/mach/mtd-xip.h b/arch/arm/plat-omap/include/mach/mtd-xip.h index 5cee7e16a1b4..39b591ff54bb 100644 --- a/arch/arm/plat-omap/include/mach/mtd-xip.h +++ b/arch/arm/plat-omap/include/mach/mtd-xip.h | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Do not include this file directly. It's included from linux/mtd/xip.h | 4 | * Do not include this file directly. It's included from linux/mtd/xip.h |
| 5 | * | 5 | * |
| 6 | * Author: Vladimir Barinov <vbarinov@ru.mvista.com> | 6 | * Author: Vladimir Barinov <vbarinov@embeddedalley.com> |
| 7 | * | 7 | * |
| 8 | * (c) 2005 MontaVista Software, Inc. This file is licensed under the | 8 | * (c) 2005 MontaVista Software, Inc. This file is licensed under the |
| 9 | * terms of the GNU General Public License version 2. This program is | 9 | * terms of the GNU General Public License version 2. This program is |