Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

diff --cc arch/arm/mach-at91/at91cap9_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9261_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9rl_devices.c
Simple merge

diff --cc arch/arm/mach-at91/board-cap9adk.c
Simple merge

diff --cc arch/arm/mach-at91/board-dk.c
Simple merge

diff --cc arch/arm/mach-at91/board-kb9202.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9rlek.c
Simple merge

diff --cc arch/arm/mach-at91/board-yl-9200.c
index e642b3a,7079050..bbbfd06
--- 1/arch/arm/mach-at91/board-yl-9200.c
--- 2/arch/arm/mach-at91/board-yl-9200.c
+++ b/arch/arm/mach-at91/board-yl-9200.c
@@@ -247,16 -176,16 +176,16 @@@ static struct mtd_partition __initdata 
  
  static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
  {
-       *num_partitions = ARRAY_SIZE(yl_9200_nand_partition);
-       return yl_9200_nand_partition;
+       *num_partitions = ARRAY_SIZE(yl9200_nand_partition);
+       return yl9200_nand_partition;
  }
  
- static struct atmel_nand_data __initdata yl_9200_nand_data = {
-       .ale= 6,
-       .cle= 7,
-       /*.det_pin      = AT91_PIN_PCxx,*/   /*we don't have a det pin because NandFlash is fixed to board*/
-       .rdy_pin        = AT91_PIN_PC14,  /*R/!B Sheet10*/
-       .enable_pin     = AT91_PIN_PC15,  /*!CE  Sheet10 */
 -static struct at91_nand_data __initdata yl9200_nand_data = {
++static struct atmel_nand_data __initdata yl9200_nand_data = {
+       .ale            = 6,
+       .cle            = 7,
+       // .det_pin     = ... not connected
+       .rdy_pin        = AT91_PIN_PC14,        /* R/!B (Sheet10) */
+       .enable_pin     = AT91_PIN_PC15,        /* !CE  (Sheet10) */
        .partition_info = nand_partitions,
  };
  

diff --cc arch/avr32/boards/atstk1000/atstk1002.c
index 5bfaf4d,e11659b..14dc5a1
--- 1/arch/avr32/boards/atstk1000/atstk1002.c
--- 2/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@@ -28,75 -28,13 +28,81 @@@
  
  #include "atstk1000.h"
  
+ /* Oscillator frequencies. These are board specific */
+ unsigned long at32_board_osc_rates[3] = {
+       [0] = 32768,    /* 32.768 kHz on RTC osc */
+       [1] = 20000000, /* 20 MHz on osc0 */
+       [2] = 12000000, /* 12 MHz on osc1 */
+ };
  
 +/*
 + * The ATSTK1006 daughterboard is very similar to the ATSTK1002. Both
 + * have the AT32AP7000 chip on board; the difference is that the
 + * STK1006 has 128 MB SDRAM (the STK1002 uses the 8 MB SDRAM chip on
 + * the STK1000 motherboard) and 256 MB NAND flash (the STK1002 has
 + * none.)
 + *
 + * The RAM difference is handled by the boot loader, so the only
 + * difference we end up handling here is the NAND flash.
 + */
 +#ifdef CONFIG_BOARD_ATSTK1006
 +#include <linux/mtd/partitions.h>
 +#include <asm/arch/smc.h>
 +
 +static struct smc_timing nand_timing __initdata = {
 +      .ncs_read_setup         = 0,
 +      .nrd_setup              = 10,
 +      .ncs_write_setup        = 0,
 +      .nwe_setup              = 10,
 +
 +      .ncs_read_pulse         = 30,
 +      .nrd_pulse              = 15,
 +      .ncs_write_pulse        = 30,
 +      .nwe_pulse              = 15,
 +
 +      .read_cycle             = 30,
 +      .write_cycle            = 30,
 +
 +      .ncs_read_recover       = 0,
 +      .nrd_recover            = 15,
 +      .ncs_write_recover      = 0,
 +      /* WE# high -> RE# low min 60 ns */
 +      .nwe_recover            = 50,
 +};
 +
 +static struct smc_config nand_config __initdata = {
 +      .bus_width              = 1,
 +      .nrd_controlled         = 1,
 +      .nwe_controlled         = 1,
 +      .nwait_mode             = 0,
 +      .byte_write             = 0,
 +      .tdf_cycles             = 2,
 +      .tdf_mode               = 0,
 +};
 +
 +static struct mtd_partition nand_partitions[] = {
 +      {
 +              .name           = "main",
 +              .offset         = 0x00000000,
 +              .size           = MTDPART_SIZ_FULL,
 +      },
 +};
 +
 +static struct mtd_partition *nand_part_info(int size, int *num_partitions)
 +{
 +      *num_partitions = ARRAY_SIZE(nand_partitions);
 +      return nand_partitions;
 +}
 +
 +struct atmel_nand_data atstk1006_nand_data __initdata = {
 +      .cle            = 21,
 +      .ale            = 22,
 +      .rdy_pin        = GPIO_PIN_PB(30),
 +      .enable_pin     = GPIO_PIN_PB(29),
 +      .partition_info = nand_part_info,
 +};
 +#endif
 +
  struct eth_addr {
        u8 addr[6];
  };

diff --cc arch/avr32/mach-at32ap/at32ap700x.c
Simple merge

diff --cc drivers/mtd/devices/block2mtd.c
Simple merge

diff --cc drivers/mtd/ftl.c
Simple merge

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

diff --cc drivers/mtd/maps/Makefile
index b29ea54,c6ce867..6cda6df
--- 1/drivers/mtd/maps/Makefile
--- 2/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@@ -63,6 -65,4 +63,5 @@@ obj-$(CONFIG_MTD_DMV182)      += dmv182.
  obj-$(CONFIG_MTD_SHARP_SL)    += sharpsl-flash.o
  obj-$(CONFIG_MTD_PLATRAM)     += plat-ram.o
  obj-$(CONFIG_MTD_OMAP_NOR)    += omap_nor.o
- obj-$(CONFIG_MTD_MTX1)                += mtx-1_flash.o
  obj-$(CONFIG_MTD_INTEL_VR_NOR)        += intel_vr_nor.o
 +obj-$(CONFIG_MTD_BFIN_ASYNC)  += bfin-async-flash.o

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

diff --cc drivers/mtd/mtdchar.c
Simple merge

diff --cc include/asm-arm/arch-at91/board.h
Simple merge

diff --cc include/asm-avr32/arch-at32ap/board.h
Simple merge

diff --cc include/linux/mtd/map.h
Simple merge

diff --cc include/linux/mtd/mtd.h
Simple merge