tree 5d8dce194c9667fa92e9ec9f545cec867a9a1e0d
parent 28b79ff9661b22e4c41c0d00d4ab8503e810f13d
parent 82965addad66fce61a92c5f03104ea90b0b87124
author David Woodhouse <dwmw2@infradead.org> 1159721753 +0100
committer David Woodhouse <dwmw2@infradead.org> 1159721753 +0100

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

Manually resolve conflict in include/mtd/Kbuild

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