linux/arch/arm/mach-at91/include/mach
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
..
at91_adc.h
at91_aic.h
at91_dbgu.h at91: remove AT91_DBGU offset from dbgu register macro 2011-07-28 15:07:28 +00:00
at91_pio.h
at91_pit.h [ARM] 5265/3: [AT91] Add copyright info 2008-09-21 23:01:18 +01:00
at91_pmc.h ARM: 5850/1: [AT91] AT572D940HF processor support 2010-01-20 12:34:06 +00:00
at91_rstc.h [ARM] 5265/3: [AT91] Add copyright info 2008-09-21 23:01:18 +01:00
at91_rtc.h
at91_rtt.h [ARM] 5265/3: [AT91] Add copyright info 2008-09-21 23:01:18 +01:00
at91_shdwc.h [ARM] 5265/3: [AT91] Add copyright info 2008-09-21 23:01:18 +01:00
at91_spi.h
at91_ssc.h
at91_st.h
at91_tc.h
at91_twi.h
at91cap9_ddrsdr.h ARM: 6185/1: AT91: PM: dual ram controller support 2010-07-09 12:31:50 +01:00
at91cap9_matrix.h
at91cap9.h at91: introduce commom AT91_BASE_SYS 2011-07-28 15:07:28 +00:00
at91rm9200_emac.h
at91rm9200_mc.h
at91rm9200.h at91: introduce commom AT91_BASE_SYS 2011-07-28 15:07:28 +00:00
at91sam9_ddrsdr.h ARM: 6185/1: AT91: PM: dual ram controller support 2010-07-09 12:31:50 +01:00
at91sam9_sdramc.h ARM: 6185/1: AT91: PM: dual ram controller support 2010-07-09 12:31:50 +01:00
at91sam9_smc.h [ARM] 5265/3: [AT91] Add copyright info 2008-09-21 23:01:18 +01:00
at91sam9g45_matrix.h [ARM] 5571/1: at91: Basic support for at91sam9g45 series: header files. 2009-06-27 11:05:21 +01:00
at91sam9g45.h ARM: mach-at91: Setup consistent dma size at boot time 2011-08-22 12:00:11 +00:00
at91sam9rl_matrix.h
at91sam9rl.h at91: introduce commom AT91_BASE_SYS 2011-07-28 15:07:28 +00:00
at91sam9260_matrix.h [ARM] 5265/3: [AT91] Add copyright info 2008-09-21 23:01:18 +01:00
at91sam9260.h at91: introduce commom AT91_BASE_SYS 2011-07-28 15:07:28 +00:00
at91sam9261_matrix.h [ARM] 5265/3: [AT91] Add copyright info 2008-09-21 23:01:18 +01:00
at91sam9261.h at91: introduce commom AT91_BASE_SYS 2011-07-28 15:07:28 +00:00
at91sam9263_matrix.h
at91sam9263.h at91: introduce commom AT91_BASE_SYS 2011-07-28 15:07:28 +00:00
at91x40.h at91: factorize common irq ID 2011-05-25 23:04:34 +08:00
at_hdmac.h dmaengine: at_hdmac: add DMA slave transfers 2009-07-22 23:15:33 -07:00
atmel-mci.h atmel-mci: change use of dma slave interface 2009-12-15 08:53:35 -08:00
board.h Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
cpu.h at91: use structure to store the current soc 2011-07-28 15:07:28 +00:00
debug-macro.S ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
entry-macro.S
gpio.h ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
gsia18s.h AT91: Support for gsia18s board 2011-01-14 19:49:04 +01:00
hardware.h at91: introduce commom AT91_BASE_SYS 2011-07-28 15:07:28 +00:00
io.h at91: add arch specific ioremap support 2011-07-28 15:09:26 +00:00
irqs.h
memory.h at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
stamp9g20.h at91: fix map_io init usage 2011-05-25 23:04:34 +08:00
system_rev.h AT91: Change nand buswidth logic to match hardware default configuration 2011-07-04 23:22:25 +02:00
system.h Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2010-10-19 20:12:24 +01:00
timex.h at91: USB-A9G20 C01 & C11 board support 2011-09-07 16:33:56 +02:00
uncompress.h
vmalloc.h