1
0
Fork 0
alistair23-linux/arch/arm/plat-omap
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/plat Merge git://git.infradead.org/mtd-2.6 2011-01-17 11:15:30 -08:00
Kconfig Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-01-06 19:13:58 -08:00
Makefile OMAP: split plat-omap/common.c 2010-10-08 11:40:19 -06:00
clock.c OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks 2010-10-08 11:40:20 -06:00
common.c Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
counter_32k.c Merge branch 'clksrc' into devel 2011-01-05 18:09:03 +00:00
cpu-omap.c OMAP: plat-omap: Fix static function warnings 2010-10-08 10:12:38 -07:00
debug-devices.c omap: use smc91x_platdata to setup smc91x 2009-12-11 16:16:33 -08:00
debug-leds.c Replacing LEDS_OMAP_DEBUG with OMAP_DEBUG_LEDS 2010-07-05 17:03:58 +03:00
devices.c omap: remove dead wdt code in plat-omap/devices.c 2010-12-17 17:45:03 -08:00
dma.c OMAP: DMA: Convert DMA library into platform driver 2010-12-20 18:38:31 -08:00
dmtimer.c omap4: Fix bootup crash observed with higher CPU clocks 2010-09-24 11:30:19 +05:30
fb.c Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux 2010-10-26 10:02:39 -07:00
fb.h OMAP: plat-omap: Fix static function warnings 2010-10-08 10:12:38 -07:00
gpio.c Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-01-15 12:33:40 -08:00
i2c.c I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c 2010-12-20 17:53:04 -08:00
io.c omap: Split omap_read/write functions for omap1 and omap2+ 2010-12-10 09:46:24 -08:00
iommu-debug.c arm/omap: use generic_file_llseek in iommu_debug 2010-09-16 10:33:11 +02:00
iommu.c OMAP: iommu: create new api to set valid da range 2010-12-15 11:29:10 -06:00
iopgtable.h omap iommu: Rename iopte_[p,v]addr -> iopte_page_[p,v]addr 2010-06-29 07:55:05 +03:00
iovmm.c OMAP: iommu: create new api to set valid da range 2010-12-15 11:29:10 -06:00
mailbox.c OMAP: mailbox: add notification support for multiple readers 2010-12-02 05:43:16 -06:00
mcbsp.c OMAP2/3: PRM/CM: prefix OMAP2 PRM/CM functions with "omap2_" 2010-12-21 21:05:14 -07:00
mux.c omap: mux: Remove old mux code 2010-07-05 16:31:40 +03:00
ocpi.c [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
omap-pm-noop.c OMAP: PM noop: implement context loss count for non-omap_devices 2010-12-21 21:31:55 -07:00
omap_device.c OMAP: PM: implement context loss count APIs 2010-12-21 21:31:55 -07:00
sram.c OMAP2/3: PRCM: split OMAP2/3-specific PRCM code into OMAP2/3-specific files 2010-12-21 20:01:55 -07:00
sram.h OMAP: plat-omap: Fix static function warnings 2010-10-08 10:12:38 -07:00
usb.c omap: Move omap1 USB platform init code into mach-omap1/usb.c 2010-07-05 16:31:30 +03:00