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 f2f210f,13e7a3c..e0fe92b
--- 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