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

Merge branch 'devel-stable' into for-next

Browse Source 
Conflicts:
	arch/arm/include/asm/atomic.h
	arch/arm/include/asm/hardirq.h
	arch/arm/kernel/smp.c
This commit is contained in:
Russell King
2013-11-12 10:58:59 +00:00
parent ec1e20a02f 70d4212687
commit df762eccba
80 changed files with 7571 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/hardirq.h
View File

@@ -5,7 +5,7 @@
#include <linux/threads.h>
#include <asm/irq.h>
#define NR_IPI 7
#define NR_IPI 8
typedef struct {
unsigned int __softirq_pending;