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>

diff --cc include/mtd/Kbuild
index f2f210fc1ef2b49663b01a9c960d5b24f8863b4d,13e7a3c6d79476274c3eb993da753f94ba08b864..e0fe92b03a4e1141c297d6d741c26fa7d59f001d
--- 1/include/mtd/Kbuild
--- 2/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