tree fe599a2cb77afa5dcfc3c07ef7f23933ea723f2e
parent 203c80187eba037f2d6562e0d5847014746726dd
parent 0ef2cfc0ca4625424e5b8ead6c47359c35a7a841
author Linus Torvalds <torvalds@linux-foundation.org> 1212707700 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1212707700 -0700

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] pxa: fix tosa.c build error
  [ARM] 5067/1: _raw_write_can_lock macro bugfix
  [ARM] 5070/1: pxa: add GPIO104_PSKTSEL to pxa27x MFP configuration
  [ARM] 5068/1: PXA2xx Additional gpio definitions
  [ARM] 5066/2: EM-X270: Fix DM9000 IRQ flags initialisation
  [ARM] 5065/2: CM-X270: Fix DM9000 IRQ flags initialisation
  [ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDP
  [ARM] 5060/1: remove unnecessary include of asm/io.h
  [ARM] fix AT91 include loops