Merge branch 'master' of /home/tmlind/src/kernel/linux-2.6/

Conflicts:

	drivers/mmc/omap.c
	drivers/mtd/nand/Makefile

diff --cc Makefile
Simple merge

diff --cc drivers/mtd/maps/omap_nor.c
Simple merge

diff --cc drivers/mtd/nand/Kconfig
Simple merge

diff --cc drivers/mtd/nand/Makefile
index e7cf382297a8a4bfe9d48380a64130bfa62fa30e,f7a53f0b70177451680402a2c2cce4c98991cd6e..69da27e2285e107aab70b90915c43f5a03de027e
--- 1/drivers/mtd/nand/Makefile
--- 2/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@@ -22,7 -23,7 +23,9 @@@ obj-$(CONFIG_MTD_NAND_TS7250)         += ts725
  obj-$(CONFIG_MTD_NAND_NANDSIM)                += nandsim.o
  obj-$(CONFIG_MTD_NAND_CS553X)         += cs553x_nand.o
  obj-$(CONFIG_MTD_NAND_NDFC)           += ndfc.o
 +obj-$(CONFIG_MTD_NAND_OMAP)           += omap-nand-flash.o
 +obj-$(CONFIG_MTD_NAND_OMAP_HW)                += omap-hw.o
+ obj-$(CONFIG_MTD_NAND_AT91)           += at91_nand.o
  
- nand-objs = nand_base.o nand_bbt.o
+ nand-objs := nand_base.o nand_bbt.o
+ cafe_nand-objs := cafe.o cafe_ecc.o