tree 630de8df04406f7de326349169d9a61e51864c99
parent 534baf55dd16d5de9c8d045190469eef9d31ffff
parent 7a3f8de5a3c36e5fde130cae74a06663b59837ae
author Linus Torvalds <torvalds@linux-foundation.org> 1320627513 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1320627513 -0800

Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
  ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver
  ARM: PXA: fix gpio-pxa.h build errors
  ARM: 7142/1: davinci: mark GPIO implementation complex
  ARM: 7134/1: Revert "EXYNOS4: Fix routing timer interrupt to offline CPU"
  ARM: PXA: eseries: fix eseries_register_clks section mismatch warning
  ARM: PXA: fix lubbock PCMCIA driver build error