FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-22 17:33:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
b93cd6a0c7
linux/arch/arm/mach-pxa
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 ARM: PXA: fix gpio-pxa.h build errors 2011-11-05 22:26:40 +00:00
am200epd.c
am300epd.c
balloon3.c Merge branch 'depends/rmk/memory_h' into next/fixes 2011-11-01 00:25:01 +01:00
capc7117.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
clock-pxa2xx.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
clock-pxa3xx.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
clock.c ARM: pxa: add clk_set_rate() 2011-07-12 19:45:19 +08:00
clock.h ARM: pxa: add clk_set_rate() 2011-07-12 19:45:19 +08:00
cm-x2xx-pci.c ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
cm-x2xx-pci.h
cm-x2xx.c Merge branch 'depends/rmk/memory_h' into next/fixes 2011-11-01 00:25:01 +01:00
cm-x255.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
cm-x270.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
cm-x300.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
colibri-evalboard.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
colibri-pxa3xx.c mtd: pxa3xx_nand: enable multiple chip select support 2011-09-11 15:02:15 +03:00
colibri-pxa270-income.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
colibri-pxa270.c arm: Add moduleparam.h to arch/arm files as required 2011-10-31 19:30:51 -04:00
colibri-pxa300.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
colibri-pxa320.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
corgi_pm.c
corgi.c arm: fix implicit module.h users by adding it to arch/arm as required. 2011-10-31 19:30:50 -04:00
cpufreq-pxa2xx.c
cpufreq-pxa3xx.c
csb701.c
csb726.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
devices.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2011-03-26 10:03:03 +00:00
devices.h
em-x270.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
eseries.c ARM: PXA: eseries: fix eseries_register_clks section mismatch warning 2011-11-05 19:09:42 +00:00
eseries.h ARM: PXA: eseries: fix eseries_register_clks section mismatch warning 2011-11-05 19:09:42 +00:00
ezx.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
generic.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
generic.h ARM: pxa: move declarations from generic.h to <soc>.h 2011-07-12 19:50:32 +08:00
gumstix.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
h5000.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
himalaya.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
hx4700.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
icontrol.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
idp.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
irq.c Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 19:55:06 -07:00
Kconfig ARM: pxa: sharpsl pm needs SPI 2011-10-08 21:03:06 +08:00
leds-idp.c
leds-lubbock.c
leds-mainstone.c
leds.c
leds.h
littleton.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
lpd270.c Merge branch 'depends/rmk/memory_h' into next/fixes 2011-11-01 00:25:01 +01:00
lubbock.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
magician.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
mainstone.c Merge branch 'depends/rmk/memory_h' into next/fixes 2011-11-01 00:25:01 +01:00
Makefile ARM: pxa: pxa95x/saarb depends on pxa3xx code 2011-10-08 21:03:00 +08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mfp-pxa2xx.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
mfp-pxa3xx.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
mioa701_bootresume.S
mioa701.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
mp900.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
mxm8x10.c mtd: pxa3xx_nand: enable multiple chip select support 2011-09-11 15:02:15 +03:00
palm27x.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2011-03-26 10:03:03 +00:00
palmld.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
palmt5.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
palmtc.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
palmte2.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
palmtreo.c Merge branch 'depends/rmk/memory_h' into next/fixes 2011-11-01 00:25:01 +01:00
palmtx.c Merge branch 'depends/rmk/memory_h' into next/fixes 2011-11-01 00:25:01 +01:00
palmz72.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
pcm027.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
pcm990-baseboard.c [media] ARM: PXA: use gpio_set_value_cansleep() on pcm990 2011-11-03 18:27:41 -02:00
pm.c ARM: pm: move cpu_init() call into core code 2011-06-24 08:48:43 +01:00
poodle.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
pxa2xx.c
pxa3xx-ulpi.c ARM: pxa: export symbols from pxa3xx-ulpi 2011-10-08 21:02:58 +08:00
pxa3xx.c Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
pxa25x.c Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
pxa27x.c Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
pxa95x.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
pxa300.c
pxa320.c
pxa930.c
raumfeld.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
reset.c
saar.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
saarb.c Merge branch 'depends/rmk/memory_h' into next/fixes 2011-11-01 00:25:01 +01:00
sharpsl_pm.c
sleep.S ARM: pm: pxa: move cpu_suspend into C code 2011-06-24 08:48:45 +01:00
smemc.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
spitz_pm.c gpio: include linux/gpio.h where needed 2011-06-16 08:40:44 -06:00
spitz.c arm: fix implicit module.h users by adding it to arch/arm as required. 2011-10-31 19:30:50 -04:00
standby.S
stargate2.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
tavorevb3.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
tavorevb.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
time.c clocksource: convert ARM 32-bit up counting clocksources 2011-05-23 18:04:51 +01:00
tosa-bt.c
tosa.c ARM: platform fixups: remove mdesc argument to fixup function 2011-10-17 09:13:41 +01:00
trizeps4.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
viper.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
vpac270.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
xcep.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
z2.c Merge branch 'depends/rmk/memory_h' into next/fixes 2011-11-01 00:25:01 +01:00
zeus.c Merge branch 'depends/rmk/memory_h' into next/fixes 2011-11-01 00:25:01 +01:00
zylonite_pxa300.c
zylonite_pxa320.c
zylonite.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00