From: David Woodhouse <dwmw2@infradead.org>
Date: Sun, 1 Oct 2006 16:55:53 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: firefly_0821_release~32748^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8a84fc15ae5cafcc366dd85cf8e1ab2040679abc;p=firefly-linux-kernel-4.4.55.git

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

Manually resolve conflict in include/mtd/Kbuild

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

8a84fc15ae5cafcc366dd85cf8e1ab2040679abc
diff --cc include/mtd/Kbuild
index f2f210fc1ef2,13e7a3c6d794..e0fe92b03a4e
--- a/include/mtd/Kbuild
+++ b/include/mtd/Kbuild
@@@ -1,1 -1,6 +1,5 @@@
- header-y := inftl-user.h jffs2-user.h mtd-abi.h mtd-user.h nftl-user.h
+ 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
 -
 -unifdef-y += mtd-abi.h