xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linus' into irq/core

Browse Source 
Pull in upstream fixes before applying conflicting changes
This commit is contained in:
Thomas Gleixner
2015-07-30 00:13:24 +02:00
parent 1559f3b8d0 cbfe8fa6cd
commit 4b979e4c61
964 changed files with 10700 additions and 6157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/c6x/include/asm/Kbuild
View File

@@ -26,6 +26,7 @@ generic-y += kdebug.h
generic-y += kmap_types.h
generic-y += local.h
generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
generic-y += mman.h
generic-y += mmu.h
generic-y += mmu_context.h

15
arch/c6x/include/asm/mm-arch-hooks.h
View File

@@ -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_C6X_MM_ARCH_HOOKS_H
#define _ASM_C6X_MM_ARCH_HOOKS_H
#endif /* _ASM_C6X_MM_ARCH_HOOKS_H */