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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source 
Conflicts:
	drivers/mtd/mtdcore.c

Merged in order that I can apply the Nomadik nand/onenand support patches.
This commit is contained in:
David Woodhouse
2009-09-20 05:55:36 -07:00
parent 304e6d5fe2 78f28b7c55
commit 6469f540ea
6530 changed files with 703226 additions and 367919 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/mtd/partitions.h
View File

@@ -1,7 +1,7 @@
/*
* MTD partitioning layer definitions
*
* (C) 2000 Nicolas Pitre <nico@cam.org>
* (C) 2000 Nicolas Pitre <nico@fluxnic.net>
*
* This code is GPL
*/