Merge branch 'h3xxx-gpios' into merged

* h3xxx-gpios:
  arm: sa1100: h3xxx: drop hand-coded gpio_request_array analogue
  arm: sa1100: h3xxx: move serial port GPIO handling to common place
  arm: sa1100: h3600: refactor IrDA GPIO handling
  arm: sa1100: h3100: refactor IrDA GPIO handling
  arm: sa1100: h3600: refactor LCD GPIO handling
  arm: sa1100: h3100: refactor LCD GPIO handling
Merge branch 'sa1100-irq2' into merged

* sa1100-irq2:
  arm: sa1100: rearrange IRQ handling code
  arm: sa1100: switch to hwirq usage
  arm: sa1100: merge IRQ 11 to "normal" irq domain
  arm: sa1100: introduce irqdomains support
  ARM: sa1100: enable IRQ domains
  arm: sa1100: use ioremap'ped access instead of direct register access
  arm: sa1100: use new functions that hide PWER access
  ARM: sa1100: add platform functions to handle PWER settings
  gpio: sa1100: use ioremapped memory instead of direct registers access
  ARM: sa1100: drop entry-macro.S
  ARM: sa1100: switch to MULTI_IRQ_HANDLER
  ARM: locomo: don't clobber chip data for chained irq
  ARM: sa1100 collie: use gpio-charger instead of pda-power
Merge branch 'locomo' into merged

* locomo:
  collie: add mmc_spi platform data
  spi: add locomo SPI driver
  gpio: locomo: implement per-pin irq handling
  ARM: drop old LoCoMo driver
  ARM: pxa: poodle: don't preallocate IRQ space for locomo
  ARM: pxa: poodle: use new LoCoMo driver
  ARM: sa1100: don't preallocate IRQ space for locomo
  ARM: sa1100: make collie use new locomo drivers
  video: backlight: drop old locomo bl/lcd driver
  video: lcd: add LoCoMo LCD driver
  video: backlight: add new locomo backlight driver
  input: convert LoCoMo keyboard driver to use new locomo core
  leds: port locomo leds driver to new locomo core
  GPIO: port LoCoMo gpio support from old driver
  mfd: add new driver for Sharp LoCoMo

Conflicts:
	arch/arm/common/locomo.c
	arch/arm/mach-sa1100/collie.c
	drivers/gpio/Kconfig
	drivers/gpio/Makefile
	drivers/mfd/Kconfig
	drivers/mfd/Makefile
Merge branch 'sa1100-no-cpufreq' into merged

* sa1100-no-cpufreq:
  pcmcia: sa1111: make use of device clock
  arm: sa1100: add a clock alias for sa1111 pcmcia device
  pcmcia: sa1100: make use of device clock
  fbdev: sa1100fb: make use of device clock
  arm: sa1100: add cpu clock
Merge branch 'sa1111-pcmcia' into merged

* sa1111-pcmcia:
  pcmcia: sa1111: pass sa1111_dev to jornada720-specific code
  pcmcia: sa1111: pass sa1111_dev to badge4-specific code
Merge branch 'sa1100-irda' into merged

* sa1100-irda:
  collie: add support for IrDA transceiver

Conflicts:
	arch/arm/mach-sa1100/include/mach/collie.h
Merge branch 'sa1100-debug' into merged

* sa1100-debug:
  ARM: debug: move StrongARM debug include to arch/arm/include/debug
Merge branch 'xscale-timer' into merged

* xscale-timer:
  arm: sa1100: use generic xscale_timer
  arm: pxa: use generic xscale_timer
  clocksource: add xscale timer support

Conflicts:
	arch/arm/mach-sa1100/generic.c
Merge branch 'gpio-charger-wakeup' into merged

* gpio-charger-wakeup:
  gpio-charger: support wakeup events
Merge branch 'collie-gpio-keys' into merged

* collie-gpio-keys:
  collie: add gpio-keys configuration

Conflicts:
	arch/arm/mach-sa1100/collie.c