leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e0d65113a7
linux/arch/arm/mach-davinci
History
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
..
include/mach Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
aemif.c davinci: aemif: signedness bug in davinci_aemif_setup_timing() 2010-12-10 07:33:51 -08:00
board-da830-evm.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
board-da850-evm.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
board-dm355-evm.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
board-dm355-leopard.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
board-dm365-evm.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
board-dm644x-evm.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
board-dm646x-evm.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
board-mityomapl138.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
board-neuros-osd2.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
board-omapl138-hawk.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-sffsdr.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-tnetv107x-evm.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
cdce949.c arm: fix implicit module.h users by adding it to arch/arm as required. 2011-10-31 19:30:50 -04:00
clock.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
clock.h Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
common.c ARM: mach-davinci: Setup consistent dma size at boot time 2011-08-22 12:00:11 +00:00
cp_intc.c arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
cpufreq.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
cpuidle.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
da830.c ARM: 7040/1: mach-davinci: break out GPIO driver specifics 2011-08-22 09:12:56 +01:00
da850.c Merge branch 'depends/rmk/gpio' into next/devel 2011-10-31 23:46:42 +01:00
devices-da8xx.c ARM: davinci: Explicitly set channel controllers' default queues 2011-09-17 15:54:08 +05:30
devices-tnetv107x.c ARM: davinci: Explicitly set channel controllers' default queues 2011-09-17 15:54:08 +05:30
devices.c davinci: make PCM platform devices static 2011-06-08 14:41:37 +05:30
dm355.c Merge branch 'next/fixes' into next/cleanup 2011-10-31 23:25:41 +01:00
dm365.c ARM: 7040/1: mach-davinci: break out GPIO driver specifics 2011-08-22 09:12:56 +01:00
dm644x.c Merge branch 'next/fixes' into next/cleanup 2011-10-31 23:25:41 +01:00
dm646x.c Merge branch 'next/fixes' into next/cleanup 2011-10-31 23:25:41 +01:00
dma.c ARM: davinci: edma: use kzalloc() 2011-09-17 15:54:09 +05:30
io.c Davinci: iotable based ioremap() interception 2010-05-13 10:05:31 -07:00
irq.c Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-19 22:10:05 -07:00
Kconfig ARM: davinci: AM18x: Add wl1271/wlan support 2011-09-17 15:53:23 +05:30
Makefile ARM: 7039/1: mach-davinci: move DaVinci TNET GPIO driver to GPIO subsystem 2011-08-22 09:12:55 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mux.c Davinci: pinmux - use ioremap() 2010-05-13 10:05:29 -07:00
mux.h Davinci: eliminate pinmux offset verbosity 2010-05-06 15:02:09 -07:00
pm.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
psc.c davinci: enable forced transitions on PSC 2011-07-08 11:10:09 +05:30
serial.c Davinci: serial - conditional reset via pwremu 2010-05-06 15:02:10 -07:00
sleep.S Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
sram.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
time.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
tnetv107x.c ARM: 7040/1: mach-davinci: break out GPIO driver specifics 2011-08-22 09:12:56 +01:00
usb.c DA8xx: assign name to MUSB IRQ resource 2010-12-11 12:15:53 +02:00