Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commitac0c955d5048c2c580fa7166a89133f0fd76c125
authorDavid Woodhouse <dwmw2@infradead.org>
Thu, 23 Aug 2007 09:43:14 +0000 (23 10:43 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Thu, 23 Aug 2007 09:43:14 +0000 (23 10:43 +0100)
tree041ac4fb544c7244a1a0b35c8ceabc142d5645c1
parent68d09b1b6780415d82160f6b6d88e82bd724e691
parentb377fd3982ad957c796758a90e2988401a884241
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
drivers/mtd/Makefile
drivers/mtd/mtdchar.c