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

Conflicts:

	include/asm-arm/arch-omap/onenand.h

diff --cc arch/arm/plat-omap/include/mach/onenand.h
index e30237117b69b75332e9b2d1cf00c963ed72cc72,d57f20226b28733743c35455bb798836ba34f299..4649d302c263723abb48c6c33579d39f96813e4f
--- 1/include/asm-arm/arch-omap/onenand.h
--- 2/arch/arm/plat-omap/include/mach/onenand.h
+++ b/arch/arm/plat-omap/include/mach/onenand.h
@@@ -16,11 -16,6 +16,10 @@@ struct omap_onenand_platform_data 
        int                     gpio_irq;
        struct mtd_partition    *parts;
        int                     nr_parts;
 -      int                     (*onenand_setup)(void __iomem *);
 +      int                     (*onenand_setup)(void __iomem *, int freq);
        int                     dma_channel;
  };
- 
 +
 +int omap2_onenand_rephase(void);
 +
 +#define ONENAND_MAX_PARTITIONS 8

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

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