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

Conflicts:

	drivers/mtd/Kconfig

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

diff --cc drivers/mtd/Kconfig
index fedf9b7eae5d96f1e6ccd5393ca334c348260c6a,6d1b91bf7ad59f3ce244eec76ea2521a94511383..c1b47db29bd23ad72f8443e4e1ad2885f7cb8f4d
--- 1/drivers/mtd/Kconfig
--- 2/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@@ -287,4 -292,7 +287,6 @@@ source "drivers/mtd/nand/Kconfig
  
  source "drivers/mtd/onenand/Kconfig"
  
 -endmenu
 -
+ source "drivers/mtd/ubi/Kconfig"
+ 
 +endif # MTD

diff --cc fs/jffs2/fs.c
Simple merge

diff --cc fs/jffs2/os-linux.h
Simple merge

diff --cc fs/jffs2/wbuf.c
Simple merge