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

Merge branch 'master' into for-next

Browse Source 
Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.
This commit is contained in:
Jiri Kosina
2011-11-13 20:55:35 +01:00
parent 4da669a2e3 52e4c2a052
commit 2290c0d06d
10515 changed files with 591719 additions and 374830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/parisc/ccio-dma.c
View File

@@ -44,6 +44,7 @@
#include <linux/seq_file.h>
#include <linux/scatterlist.h>
#include <linux/iommu-helper.h>
#include <linux/export.h>
#include <asm/byteorder.h>
#include <asm/cache.h> /* for L1_CACHE_BYTES */

1
drivers/parisc/sba_iommu.c
View File

@@ -39,6 +39,7 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/module.h>
#include <asm/ropes.h>
#include <asm/mckinley.h> /* for proc_mckinley_root */