linux/arch/arm/mach-omap1
Linus Torvalds ab2020f2f1 Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (59 commits)
  mtd: mtdpart: disallow reading OOB past the end of the partition
  mtd: pxa3xx_nand: NULL dereference in pxa3xx_nand_probe
  UBI: use mtd->writebufsize to set minimal I/O unit size
  mtd: initialize writebufsize in the MTD object of a partition
  mtd: onenand: add mtd->writebufsize initialization
  mtd: nand: add mtd->writebufsize initialization
  mtd: cfi: add writebufsize initialization
  mtd: add writebufsize field to mtd_info struct
  mtd: OneNAND: OMAP2/3: prevent regulator sleeping while OneNAND is in use
  mtd: OneNAND: add enable / disable methods to onenand_chip
  mtd: m25p80: Fix JEDEC ID for AT26DF321
  mtd: txx9ndfmc: limit transfer bytes to 512 (ECC provides 6 bytes max)
  mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips
  mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chips
  mtd: nand: ams-delta: drop omap_read/write, use ioremap
  mtd: m25p80: add debugging trace in sst_write
  mtd: nand: ams-delta: select for built-in by default
  mtd: OneNAND: lighten scary initial bad block messages
  mtd: OneNAND: OMAP2/3: add support for command line partitioning
  mtd: nand: rearrange ONFI revision checking, add ONFI 2.3
  ...

Fix up trivial conflict in drivers/mtd/Kconfig as per DavidW.
2011-01-17 11:15:30 -08:00
..
include/mach
ams-delta-fiq-handler.S
ams-delta-fiq.c
board-ams-delta.c Merge git://git.infradead.org/mtd-2.6 2011-01-17 11:15:30 -08:00
board-fsample.c
board-generic.c
board-h2-mmc.c
board-h2.c
board-h2.h
board-h3-mmc.c
board-h3.c
board-h3.h
board-htcherald.c
board-innovator.c
board-nokia770.c
board-osk.c
board-palmte.c
board-palmtt.c
board-palmz71.c
board-perseus2.c
board-sx1-mmc.c
board-sx1.c
board-voiceblue.c
clock_data.c
clock.c
clock.h
devices.c
dma.c
flash.c
fpga.c
gpio7xx.c
gpio15xx.c
gpio16xx.c
i2c.c
id.c
io.c
irq.c
Kconfig
lcd_dma.c
leds-h2p2-debug.c
leds-innovator.c
leds-osk.c
leds.c
leds.h
mailbox.c
Makefile
Makefile.boot
mcbsp.c
mux.c
opp_data.c
opp.h
pm_bus.c
pm.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
pm.h
serial.c
sleep.S
sram.S
time.c
timer32k.c
usb.c