FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-30 21:46:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6b5f6ab0e1
linux/arch/arm/mach-pxa
History
Linus Torvalds 29a6ccca38 Merge git://git.infradead.org/mtd-2.6 
* git://git.infradead.org/mtd-2.6: (97 commits)
  mtd: kill CONFIG_MTD_PARTITIONS
  mtd: remove add_mtd_partitions, add_mtd_device and friends
  mtd: convert remaining users to mtd_device_register()
  mtd: samsung onenand: convert to mtd_device_register()
  mtd: omap2 onenand: convert to mtd_device_register()
  mtd: txx9ndfmc: convert to mtd_device_register()
  mtd: tmio_nand: convert to mtd_device_register()
  mtd: socrates_nand: convert to mtd_device_register()
  mtd: sharpsl: convert to mtd_device_register()
  mtd: s3c2410 nand: convert to mtd_device_register()
  mtd: ppchameleonevb: convert to mtd_device_register()
  mtd: orion_nand: convert to mtd_device_register()
  mtd: omap2: convert to mtd_device_register()
  mtd: nomadik_nand: convert to mtd_device_register()
  mtd: ndfc: convert to mtd_device_register()
  mtd: mxc_nand: convert to mtd_device_register()
  mtd: mpc5121_nfc: convert to mtd_device_register()
  mtd: jz4740_nand: convert to mtd_device_register()
  mtd: h1910: convert to mtd_device_register()
  mtd: fsmc_nand: convert to mtd_device_register()
  ...

Fixed up trivial conflicts in
 - drivers/mtd/maps/integrator-flash.c: removed in ARM tree
 - drivers/mtd/maps/physmap.c: addition of afs partition probe type
   clashing with removal of CONFIG_MTD_PARTITIONS
2011-05-27 20:06:53 -07:00
..
include/mach Merge branch 'devel-stable' into for-linus 2011-05-23 19:28:04 +01:00
am200epd.c ARM: pxa/am200epd: fix leak in am200_init_gpio_regs error path 2011-03-17 18:16:12 +08:00
am300epd.c ARM: pxa/am300epd: fix leak in am300_init_gpio_regs error path 2011-03-17 23:06:29 +08:00
balloon3.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
capc7117.c
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
clock.h ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
cm-x2xx-pci.c ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizes 2011-05-12 08:36:53 +01:00
cm-x2xx-pci.h
cm-x2xx.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
cm-x255.c
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 branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-30 07:50:45 -07: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 ARM: pxa: clean up set_pxa_fb_info 2011-03-16 16:32:47 +08: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 / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
colibri-pxa300.c ARM: pxa/colibri: use correct SD detect pin 2011-02-09 23:05:03 +08:00
colibri-pxa320.c
corgi_pm.c
corgi.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
cpufreq-pxa2xx.c
cpufreq-pxa3xx.c
csb701.c
csb726.c ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00: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 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
eseries.c ARM: pxa/eseries: switch to using gpio-vbus transceiver 2011-03-16 16:32:48 +08:00
eseries.h
ezx.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
generic.c ARM: Fix build regression on SA11x0, PXA, and H720x targets 2011-01-15 00:14:25 +00:00
generic.h ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
gumstix.c ARM: pxa/gumstix: switch to using gpio-vbus transceiver 2011-03-16 16:32:48 +08:00
h5000.c
himalaya.c
hx4700.c ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info 2011-05-20 22:27:34 +01:00
icontrol.c
idp.c ARM: pxa: clean up set_pxa_fb_info 2011-03-16 16:32:47 +08:00
irq.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
Kconfig mtd: pxa: convert to mtd_device_register() 2011-05-25 02:20:48 +01:00
leds-idp.c
leds-lubbock.c
leds-mainstone.c
leds.c
leds.h
littleton.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
lpd270.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
lubbock.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
magician.c ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info 2011-05-20 22:27:34 +01:00
mainstone.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
Makefile
Makefile.boot
mfp-pxa2xx.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02: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 / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
mp900.c
mxm8x10.c ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00: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 / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
palmt5.c
palmtc.c ARM: pxa: clean up set_pxa_fb_info 2011-03-16 16:32:47 +08:00
palmte2.c ARM: pxa: clean up set_pxa_fb_info 2011-03-16 16:32:47 +08:00
palmtreo.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
palmtx.c
palmz72.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
pcm027.c
pcm990-baseboard.c Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-30 07:50:45 -07:00
pm.c Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', 'irqdata', 'pm', 'sh', 'smp', 'spear', 'ux500' and 'via' into devel 2011-03-16 23:35:17 +00:00
poodle.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
pxa2xx.c
pxa3xx-ulpi.c
pxa3xx.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
pxa25x.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
pxa27x.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
pxa95x.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
pxa300.c
pxa320.c
pxa930.c
raumfeld.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
reset.c
saar.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
saarb.c ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
sharpsl_pm.c
sleep.S ARM: pm: convert PXA to generic suspend/resume support 2011-02-22 17:11:24 +00:00
smemc.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
spitz_pm.c
spitz.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
standby.S
stargate2.c ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
tavorevb3.c ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
tavorevb.c ARM: pxa: clean up set_pxa_fb_info 2011-03-16 16:32:47 +08:00
time.c clocksource: convert ARM 32-bit up counting clocksources 2011-05-23 18:04:51 +01:00
tosa-bt.c ARM: pxa/tosa: drop setting LED trigger name, as it's unsupported now 2011-02-27 21:38:18 +08:00
tosa.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
trizeps4.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
viper.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
vpac270.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
xcep.c ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
z2.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
zeus.c Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-30 07:50:45 -07:00
zylonite_pxa300.c ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
zylonite_pxa320.c
zylonite.c ARM: pxa: clean up set_pxa_fb_info 2011-03-16 16:32:47 +08:00