diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-08-21 11:27:29 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-08-21 11:27:29 -0400 |
| commit | e9dc122166b8d863d3057a66ada04838e5548e52 (patch) | |
| tree | 749e15bf719b64bf9113db7acd8e043d9742cb26 /arch/mips/mm/extable.c | |
| parent | 560ab42ef923aaf2e4347315bdfcc74b2708972c (diff) | |
| parent | 405d8f8b1d936414da2093d4149ff790ff3f84a5 (diff) | |
Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 into for-2.6.32-incoming
Conflicts:
net/sunrpc/cache.c
Diffstat (limited to 'arch/mips/mm/extable.c')
| -rw-r--r-- | arch/mips/mm/extable.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/mm/extable.c b/arch/mips/mm/extable.c index 297fb9f390d..9d25d2ba4b9 100644 --- a/arch/mips/mm/extable.c +++ b/arch/mips/mm/extable.c @@ -1,5 +1,9 @@ /* - * linux/arch/mips/mm/extable.c + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * Copyright (C) 1997, 99, 2001 - 2004 Ralf Baechle <ralf@linux-mips.org> */ #include <linux/module.h> #include <linux/spinlock.h> |