Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

Browse source

...

This commit is contained in:

Linus Torvalds 2005-07-16 10:24:32 -07:00

parent 9fb1759a31 19870da7ea

commit 1fa4aad496

3 changed files with 112 additions and 104 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

22

drivers/mtd/nand/nand_base.c

View file

20

drivers/mtd/nand/nand_bbt.c

View file

182

fs/jffs2/erase.c

View file