A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-31 04:01:48 -04:00
Code Issues Projects Releases Packages 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
commit 4b979e4c61
964 changed files with 10692 additions and 6149 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/blackfin/include/asm/Kbuild
View file

@ -21,6 +21,7 @@ generic-y += kvm_para.h
generic-y += local.h
generic-y += local64.h
generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
generic-y += mman.h
generic-y += msgbuf.h
generic-y += mutex.h

15
arch/blackfin/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_BLACKFIN_MM_ARCH_HOOKS_H
#define _ASM_BLACKFIN_MM_ARCH_HOOKS_H
#endif /* _ASM_BLACKFIN_MM_ARCH_HOOKS_H */