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-linus

Browse Source 
Conflicts:
	drivers/perf/arm_pmu.c
This commit is contained in:
Russell King
2015-09-03 15:28:50 +01:00
parent 40d3f02851 81497953e3
commit 3ff32a0def
30 changed files with 590 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-ux500/cpu-db8500.c
View File

@@ -20,10 +20,10 @@
#include <linux/mfd/dbx500-prcmu.h>
#include <linux/of.h>
#include <linux/of_platform.h>
#include <linux/perf/arm_pmu.h>
#include <linux/regulator/machine.h>
#include <linux/random.h>
#include <asm/pmu.h>
#include <asm/mach/map.h>
#include "setup.h"