tree 7f98317bdd45dbdb7644e9179891c5af6a3a8ef1
parent 78ab67da1002d954ea4c3e2b441e2483c41f94e8
parent a205752d1ad2d37d6597aaae5a56fc396a770868
author David Woodhouse <dwmw2@infradead.org> 1177697779 +0100
committer David Woodhouse <dwmw2@infradead.org> 1177697779 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/mtd/Kconfig

Signed-off-by: David Woodhouse <dwmw2@infradead.org>