linux/arch/avr32
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
..
boards mtd: ATMEL, AVR32: inline nand partition table access 2011-09-11 15:01:57 +03:00
boot avr32: remove .note.gnu.build-id section when making vmlinux.bin 2008-12-17 11:44:10 +01:00
configs rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
include/asm atomic: cleanup asm-generic atomic*.h inclusion 2011-07-26 16:49:47 -07:00
kernel All Arch: remove linkage for sys_nfsservctl system call 2011-08-26 15:09:58 -07:00
lib asm-generic: rename generic little-endian bitops functions 2011-03-23 19:46:11 -07:00
mach-at32ap Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
mm avr32: add export.h to arch/avr32 for EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:30:59 -04:00
oprofile Add kernel support for oprofile callgraphs on AVR32 2008-09-22 09:51:01 +02:00
Kconfig Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG 2011-08-03 11:12:37 -04:00
Kconfig.debug
Makefile kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line 2010-08-03 14:09:45 +02:00