David Woodhouse 8a84fc15ae 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>		2006-10-01 17:55:53 +01:00
..
Kbuild	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-10-01 17:55:53 +01:00
inftl-user.h	…
jffs2-user.h	…
mtd-abi.h	[MTD] Remove #ifndef __KERNEL__ hack in <mtd/mtd-abi.h>	2006-09-25 21:52:21 +01:00
mtd-user.h	…
nftl-user.h	…