1
linux/arch/arm/mach-orion5x
Linus Torvalds 7cc4e87f91 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.
2008-10-11 10:09:45 -07:00
..
include/mach [ARM] Orion: add 88F6183 (Orion-1-90) support 2008-09-25 16:26:44 -04:00
addr-map.c [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
common.c [ARM] Orion: add 88F6183 (Orion-1-90) support 2008-09-25 16:26:44 -04:00
common.h Merge branch 'for-rmk' of git://git.marvell.com/orion 2008-10-09 21:33:07 +01:00
db88f5281-setup.c mv643xx_eth: remove force_phy_addr field 2008-09-05 06:33:59 +02:00
dns323-setup.c mv643xx_eth: remove force_phy_addr field 2008-09-05 06:33:59 +02:00
edmini_v2-setup.c [ARM] EDMINIV2: add support for LED and power button 2008-09-25 16:27:22 -04:00
gpio.c [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
irq.c Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
Kconfig [ARM] Orion: Add Buffalo Linkstation Mini support 2008-09-25 17:00:01 -04:00
kurobox_pro-setup.c Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2008-10-11 10:09:45 -07:00
lsmini-setup.c [ARM] Orion: Add Buffalo Linkstation Mini power-off method 2008-09-25 23:54:19 -04:00
Makefile [ARM] Orion: Add Buffalo Linkstation Mini support 2008-09-25 17:00:01 -04:00
Makefile.boot
mpp.c [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
mpp.h [ARM] Orion: rework MPP handling 2008-06-22 22:44:47 +02:00
mss2-setup.c mv643xx_eth: remove force_phy_addr field 2008-09-05 06:33:59 +02:00
mv2120-setup.c mv643xx_eth: remove force_phy_addr field 2008-09-05 06:33:59 +02:00
pci.c [ARM] Orion: Fix boot crash on Kurobox Pro 2008-08-21 22:15:17 -04:00
rd88f5181l-fxo-setup.c mv643xx_eth: remove force_phy_addr field 2008-09-05 06:33:59 +02:00
rd88f5181l-ge-setup.c mv643xx_eth: remove force_phy_addr field 2008-09-05 06:33:59 +02:00
rd88f5182-setup.c mv643xx_eth: remove force_phy_addr field 2008-09-05 06:33:59 +02:00
rd88f6183ap-ge-setup.c [ARM] Orion: add RD88F6183AP-GE support 2008-09-25 16:27:21 -04:00
terastation_pro2-setup.c [ARM] Orion: add Buffalo Terastation Pro II/Live support 2008-09-25 16:26:44 -04:00
ts78xx-setup.c mv643xx_eth: remove force_phy_addr field 2008-09-05 06:33:59 +02:00
ts209-setup.c [ARM] Orion: register UART1 on QNAP TS-209 and TS-409 2008-08-21 22:15:17 -04:00
ts409-setup.c [ARM] Orion: register UART1 on QNAP TS-209 and TS-409 2008-08-21 22:15:17 -04:00
tsx09-common.c Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2008-10-11 10:09:45 -07:00
tsx09-common.h [ARM] Orion: remove code duplication in TS209 and TS409 setup files 2008-06-22 22:44:54 +02:00
wnr854t-setup.c mv643xx_eth: remove force_phy_addr field 2008-09-05 06:33:59 +02:00
wrt350n-v2-setup.c mv643xx_eth: remove force_phy_addr field 2008-09-05 06:33:59 +02:00