aha/include/mtd/Kbuild

header-y += inftl-user.h
header-y += jffs2-user.h
header-y += mtd-abi.h
header-y += mtd-user.h
header-y += nftl-user.h
[HEADERS] One line per header in Kbuild files to reduce conflicts Signed-off-by: David Woodhouse <dwmw2@infradead.org> 2006-09-19 11:43:58 +00:00			`header-y += inftl-user.h`
			`header-y += jffs2-user.h`
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 16:55:53 +00:00			`header-y += mtd-abi.h`
[HEADERS] One line per header in Kbuild files to reduce conflicts Signed-off-by: David Woodhouse <dwmw2@infradead.org> 2006-09-19 11:43:58 +00:00			`header-y += mtd-user.h`
			`header-y += nftl-user.h`