1
linux/arch/arm/mach-omap2
Russell King 0ff66f0c7a Merge branch 'pxa-plat' into devel
* pxa-plat: (53 commits)
  [ARM] 4762/1: Basic support for Toradex Colibri module
  [ARM] pxa: fix mci_init functions returning -1
  [ARM] 4737/1: Refactor corgi_lcd to improve readability + bugfix
  [ARM] 4747/1: pcm027: support for pcm990 baseboard for phyCORE-PXA270
  [ARM] 4746/1: pcm027: network support for phyCORE-PXA270
  [ARM] 4745/1: pcm027: default configuration
  [ARM] 4744/1: pcm027: add support for phyCORE-PXA270 CPU module
  [NET] smc91x: Make smc91x use IRQ resource trigger flags
  [ARM] pxa: add default config for littleton
  [ARM] pxa: add basic support for Littleton (PXA3xx Form Factor Platform)
  [ARM] 4664/1: Add basic support for HTC Magician PDA phones
  [ARM] 4649/1: Base support for pxa-based Toshiba e-series PDAs.
  [ARM] pxa: skip registers saving/restoring if entering standby mode
  [ARM] pxa: fix PXA27x resume
  [ARM] pxa: Avoid fiddling with CKEN register on suspend
  [ARM] pxa: Add PXA3 standby code hooked into the IRQ wake scheme
  [ARM] pxa: Add zylonite MFP wakeup configurations
  [ARM] pxa: program MFPs for low power mode when suspending
  [ARM] pxa: make MFP configuration processor independent
  [ARM] pxa: remove un-used pxa3xx_mfp_set_xxx() functions
  ...

Conflicts:

	arch/arm/mach-pxa/ssp.c

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-01-28 13:21:38 +00:00
..
board-2430sdp.c [NET] smc91x: Make smc91x use IRQ resource trigger flags 2008-01-28 13:13:19 +00:00
board-apollon.c Merge branch 'pxa-plat' into devel 2008-01-28 13:21:38 +00:00
board-generic.c fix file specification in comments 2006-10-03 23:01:26 +02:00
board-h4.c ARM: OMAP: abstract debug card setup (smc, leds) 2007-09-20 09:59:20 -07:00
clock.c [ARM] Fix assignment instead of condition in arm/mach-omap2/clock.c 2007-10-31 15:21:43 +00:00
clock.h [ARM] spelling fixes 2007-05-20 20:10:32 +01:00
devices.c ARM: OMAP: Add minimal OMAP2430 support 2007-09-20 09:59:20 -07:00
gpmc.c ARM: OMAP: Merge gpmc changes from N800 tree 2007-09-20 09:59:26 -07:00
id.c ARM: OMAP: Add minimal OMAP2430 support 2007-09-20 09:59:20 -07:00
io.c ARM: OMAP: Add minimal OMAP2430 support 2007-09-20 09:59:20 -07:00
irq.c ARM: OMAP: Optimize INTC register accesses and enable autoidling 2007-09-20 09:59:19 -07:00
Kconfig ARM: OMAP: Add minimal OMAP2430 support 2007-09-20 09:59:20 -07:00
mailbox.c ARM: OMAP: Add mailbox support for IVA 2007-05-09 10:37:10 +01:00
Makefile ARM: OMAP: Add minimal OMAP2430 support 2007-09-20 09:59:20 -07:00
Makefile.boot
memory.c ARM: OMAP: omap2/memory.c compile fixes 2007-09-20 09:59:20 -07:00
memory.h
mux.c ARM: OMAP: Tabify mux.c 2007-09-20 09:59:20 -07:00
pm-domain.c Remove all inclusions of <linux/config.h> 2006-10-04 03:38:54 -04:00
pm.c PM: Rework struct platform_suspend_ops 2007-10-18 14:37:18 -07:00
prcm-regs.h fix file specification in comments 2006-10-03 23:01:26 +02:00
prcm.c ARM: OMAP: Avoid sleeping during arch_reset 2006-09-25 12:41:20 +03:00
serial.c ARM: OMAP: Enable serial idling and wakeup features 2007-08-22 00:42:52 -07:00
sleep.S Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sram-fn.S fix file specification in comments 2006-10-03 23:01:26 +02:00
timer-gp.c [ARM] Fix timer damage from d3d74453c3 2008-01-28 10:17:12 +00:00
usb-tusb6010.c ARM: OMAP: TUSB EVM init 2007-09-20 09:59:21 -07:00