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 0000000000000000000000000000000000000000,d57f20226b28733743c35455bb798836ba34f299..4649d302c263723abb48c6c33579d39f96813e4f
mode 000000,100644..100644
--- /dev/null
--- 2/arch/arm/plat-omap/include/mach/onenand.h
+++ b/arch/arm/plat-omap/include/mach/onenand.h
@@@ -1,0 -1,21 +1,25 @@@
 -      int                     (*onenand_setup)(void __iomem *);
+ /*
+  * arch/arm/plat-omap/include/mach/onenand.h
+  *
+  * Copyright (C) 2006 Nokia Corporation
+  * Author: Juha Yrjola
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License version 2 as
+  * published by the Free Software Foundation.
+  */
+ 
+ #include <linux/mtd/partitions.h>
+ 
+ struct omap_onenand_platform_data {
+       int                     cs;
+       int                     gpio_irq;
+       struct mtd_partition    *parts;
+       int                     nr_parts;
++      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