linux/arch/avr32/mach-at32ap
Linus Torvalds e0d65113a7 Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (226 commits)
  mtd: tests: annotate as DANGEROUS in Kconfig
  mtd: tests: don't use mtd0 as a default
  mtd: clean up usage of MTD_DOCPROBE_ADDRESS
  jffs2: add compr=lzo and compr=zlib options
  jffs2: implement mount option parsing and compression overriding
  mtd: nand: initialize ops.mode
  mtd: provide an alias for the redboot module name
  mtd: m25p80: don't probe device which has status of 'disabled'
  mtd: nand_h1900 never worked
  mtd: Add DiskOnChip G3 support
  mtd: m25p80: add EON flash EN25Q32B into spi flash id table
  mtd: mark block device queue as non-rotational
  mtd: r852: make r852_pm_ops static
  mtd: m25p80: add support for at25df321a spi data flash
  mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
  mtd: nand: switch `check_pattern()' to standard `memcmp()'
  mtd: nand: invalidate cache on unaligned reads
  mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
  mtd: nand: wait to set BBT version
  mtd: nand: scrub BBT on ECC errors
  ...

Fix up trivial conflicts:
 - arch/arm/mach-at91/board-usb-a9260.c
	Merged into board-usb-a926x.c
 - drivers/mtd/maps/lantiq-flash.c
	add_mtd_partitions -> mtd_device_register vs changed to use
	mtd_device_parse_register.
2011-11-07 09:11:16 -08:00
..
include/mach mtd: ATMEL, AVR32: inline nand partition table access 2011-09-11 15:01:57 +03:00
at32ap700x.c avr32/at32ap: fix mapping of platform device id for USART 2011-06-14 13:37:29 +02:00
clock.c avr32: add export.h to arch/avr32 for EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:30:59 -04:00
clock.h avr32: Hammerhead board support 2009-01-05 15:52:04 +01:00
cpufreq.c avr32: add export.h to arch/avr32 for EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:30:59 -04:00
extint.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
hmatrix.c avr32: Clean up HMATRIX code 2008-08-08 12:44:01 +02:00
hsmc.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
hsmc.h [PATCH] AVR32: Use __raw MMIO access for internal peripherals 2006-10-25 20:26:33 -07:00
intc.c avr32: add export.h to arch/avr32 for EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:30:59 -04:00
intc.h [PATCH] AVR32: Use __raw MMIO access for internal peripherals 2006-10-25 20:26:33 -07:00
Kconfig [AVR32] Add support for AT32AP7001 and AT32AP7002 2008-01-25 08:31:41 +01:00
Makefile avr32: Clean up HMATRIX code 2008-08-08 12:44:01 +02:00
pdc.c avr32: Use platform_driver_probe for pdc platform driver 2008-09-22 09:51:03 +02:00
pio.c avr32: add export.h to arch/avr32 for EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:30:59 -04:00
pio.h avr32: Fix typo of IFSR in a comment in the PIO header file 2008-07-04 09:48:05 +02:00
pm-at32ap700x.S avr32: Fix .size directive for cpu_enter_idle 2011-04-13 15:46:49 +02:00
pm.c suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
pm.h avr32: Add MMIO address definitions for certain controllers 2008-08-08 12:42:14 +02:00
sdramc.h avr32: Power Management support ("standby" and "mem" modes) 2008-07-02 11:05:01 +02:00