diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-20 23:21:28 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-20 23:21:28 +0300 |
| commit | ed15e8880fc3d8d52bc02a02521054bfcb26264a (patch) | |
| tree | 816a7f35028762976f5d4bc4df172e407c4bcbe2 /arch/m32r/include/asm/mm-arch-hooks.h | |
| parent | b8d1f261fe7e4967593a5637d62991b6197a03f8 (diff) | |
| parent | 52721d9d3334c1cb1f76219a161084094ec634dc (diff) | |
| download | linux-ed15e8880fc3d8d52bc02a02521054bfcb26264a.tar.xz | |
Merge 4.2-rc3 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/m32r/include/asm/mm-arch-hooks.h')
| -rw-r--r-- | arch/m32r/include/asm/mm-arch-hooks.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/m32r/include/asm/mm-arch-hooks.h b/arch/m32r/include/asm/mm-arch-hooks.h deleted file mode 100644 index 6d60b4750f41..000000000000 --- a/arch/m32r/include/asm/mm-arch-hooks.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Architecture specific mm hooks - * - * Copyright (C) 2015, IBM Corporation - * Author: Laurent Dufour <ldufour@linux.vnet.ibm.com> - * - * 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. - */ - -#ifndef _ASM_M32R_MM_ARCH_HOOKS_H -#define _ASM_M32R_MM_ARCH_HOOKS_H - -#endif /* _ASM_M32R_MM_ARCH_HOOKS_H */ |