-
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6David Woodhouse authored
Conflicts: drivers/mtd/Kconfig Signed-off-by: David Woodhouse <dwmw2@infradead.org>
d1da4e50
Conflicts:
drivers/mtd/Kconfig
Signed-off-by: David Woodhouse <dwmw2@infradead.org>