lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests 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

Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.
This commit is contained in:
David Woodhouse
2010-05-10 14:32:46 +01:00
parent 6f1f3d0ab5 b57f95a382
commit 0ae28a35bc
5248 changed files with 42453 additions and 13244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/mtd/nand/tmio_nand.c
View File

@@ -37,6 +37,7 @@
#include <linux/mtd/nand.h>
#include <linux/mtd/nand_ecc.h>
#include <linux/mtd/partitions.h>
#include <linux/slab.h>
/*--------------------------------------------------------------------------*/