Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
David Woodhouse [Thu, 23 Aug 2007 09:43:14 +0000 (10:43 +0100)]
1  2 
drivers/mtd/Makefile
drivers/mtd/mtdchar.c

Simple merge
Simple merge