WSL2-Linux-Kernel/arch/arm/mach-davinci
Linus Torvalds 60d9aa758c Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (90 commits)
  jffs2: Fix long-standing bug with symlink garbage collection.
  mtd: OneNAND: Fix test of unsigned in onenand_otp_walk()
  mtd: cfi_cmdset_0002, fix lock imbalance
  Revert "mtd: move mxcnd_remove to .exit.text"
  mtd: m25p80: add support for Macronix MX25L4005A
  kmsg_dump: fix build for CONFIG_PRINTK=n
  mtd: nandsim: add support for 4KiB pages
  mtd: mtdoops: refactor as a kmsg_dumper
  mtd: mtdoops: make record size configurable
  mtd: mtdoops: limit the maximum mtd partition size
  mtd: mtdoops: keep track of used/unused pages in an array
  mtd: mtdoops: several minor cleanups
  core: Add kernel message dumper to call on oopses and panics
  mtd: add ARM pismo support
  mtd: pxa3xx_nand: Fix PIO data transfer
  mtd: nand: fix multi-chip suspend problem
  mtd: add support for switching old SST chips into QRY mode
  mtd: fix M29W800D dev_id and uaddr
  mtd: don't use PF_MEMALLOC
  mtd: Add bad block table overrides to Davinci NAND driver
  ...

Fixed up conflicts (mostly trivial) in
	drivers/mtd/devices/m25p80.c
	drivers/mtd/maps/pcmciamtd.c
	drivers/mtd/nand/pxa3xx_nand.c
	kernel/printk.c
2009-12-16 10:23:43 -08:00
..
include/mach Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
Kconfig davinci: Initial support for Neuros OSD2 platform. 2009-11-25 10:21:39 -08:00
Makefile davinci: Initial support for Neuros OSD2 platform. 2009-11-25 10:21:39 -08:00
Makefile.boot davinci: da8xx: Add base DA830/OMAP-L137 SoC support 2009-08-26 10:56:59 +03:00
board-da830-evm.c DA8xx/OMAP-L1xx: Add high speed SD/MMC capabilities 2009-11-25 10:21:38 -08:00
board-da850-evm.c da850/omap-l138: add callback to control LCD panel power 2009-12-16 07:20:05 -08:00
board-dm355-evm.c DaVinci: rename setup_usb() to davinci_setup_usb() 2009-11-25 10:21:33 -08:00
board-dm355-leopard.c DaVinci: rename setup_usb() to davinci_setup_usb() 2009-11-25 10:21:33 -08:00
board-dm365-evm.c DaVinci: DM365: Enable DaVinci RTC support for DM365 EVM 2009-11-25 10:21:38 -08:00
board-dm644x-evm.c DaVinci: rename setup_usb() to davinci_setup_usb() 2009-11-25 10:21:33 -08:00
board-dm646x-evm.c davinci: fix section mismatch warning in arch/arm/mach-davinci/board-dm646x-evm.c 2009-11-25 10:21:38 -08:00
board-neuros-osd2.c davinci: Initial support for Neuros OSD2 platform. 2009-11-25 10:21:39 -08:00
board-sffsdr.c davinci: remove unused variable in arch/arm/mach-davinci/board-sffsdr.c 2009-11-25 10:21:38 -08:00
clock.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
clock.h davinci: DA8xx: rename 'psc_ctlr' field into 'gpsc' 2009-11-25 10:21:30 -08:00
common.c davinci: make it easier to identify SoC init failures 2009-11-25 10:21:31 -08:00
cp_intc.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
cpufreq.c davinci: DA850/OMAP-L138: avoid using separate initcall for initializing regulator 2009-11-25 10:21:37 -08:00
cpuidle.c davinci: add CPU idle driver 2009-11-25 10:21:37 -08:00
da830.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
da850.c davinci: DA850/OMAP-L138: avoid using separate initcall for initializing regulator 2009-11-25 10:21:37 -08:00
devices-da8xx.c davinci: DA8XX/OMAP-L1XX: add support for cpuidle driver register 2009-11-25 10:21:37 -08:00
devices.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
dm355.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
dm365.c DaVinci: DM365: Enable DaVinci RTC support for DM365 EVM 2009-11-25 10:21:38 -08:00
dm644x.c davinci: Initial support for Neuros OSD2 platform. 2009-11-25 10:21:39 -08:00
dm646x.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
dma.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
gpio.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
io.c davinci: Encapsulate SoC-specific data in a structure 2009-05-26 08:14:04 -07:00
irq.c davinci: Move interrupt ctlr info to SoC infrastructure 2009-05-26 08:18:09 -07:00
mux.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
mux.h davinci: update pin-multiplexing support 2009-04-27 09:49:46 -07:00
psc.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
serial.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
sram.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
time.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
usb.c DA8xx: MUSB platform device registration 2009-11-25 10:21:33 -08:00