linux/drivers/mfd
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
..
asic3.c mfd: Fix asic3 compilation 2008-09-30 09:57:22 +02:00
htc-egpio.c gpio: sysfs interface 2008-07-25 10:53:30 -07:00
htc-pasic3.c mfd: fix platform driver hotplug/coldplug 2008-07-25 10:53:28 -07:00
Kconfig Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2008-10-11 10:09:45 -07:00
Makefile Merge branch 'pxa-palm' into pxa-machines 2008-10-07 19:07:22 +01:00
mcp-core.c
mcp-sa11x0.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
mcp.h
mfd-core.c mfd: accept pure device as a parent, not only platform_device 2008-07-29 01:30:26 +02:00
sm501.c mfd: sm501 fix gpio number calculation for upper bank 2008-07-25 10:53:30 -07:00
t7l66xb.c mfd: t7l66 MMC platform data 2008-08-10 20:10:15 +02:00
tc6387xb.c mfd: tc6387 MMC platform data 2008-08-10 20:10:10 +02:00
tc6393xb.c mfd: tc6393 cleanup and update 2008-08-10 23:32:07 +02:00
ucb1x00-assabet.c
ucb1x00-core.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
ucb1x00-ts.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
ucb1x00.h
ucb1400_core.c [ARM] 5184/1: Split ucb1400_ts into core and touchscreen 2008-08-20 23:22:22 +01:00