Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Sun, 1 Oct 2006 16:55:53 +0000 (17:55 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sun, 1 Oct 2006 16:55:53 +0000 (17:55 +0100)
Manually resolve conflict in include/mtd/Kbuild

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
1  2 
include/mtd/Kbuild

diff --combined 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