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

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable

Browse Source 
Conflicts:
	arch/arm/common/gic.c
	arch/arm/plat-omap/include/plat/common.h
This commit is contained in:
Russell King
2011-12-05 23:20:17 +00:00
parent ba8bb18a03 ae72fd588a
commit 742eaa6a6e
679 changed files with 7360 additions and 5347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/mach/arch.h
View File

@@ -13,6 +13,7 @@
struct tag;
struct meminfo;
struct sys_timer;
struct pt_regs;
struct machine_desc {
unsigned int nr; /* architecture number */