tree 1bf2ac7d5c482afb2c5cf59c0fc7db7c7ac03ff6
parent 553cbf0a8f19c669bed82028988aa977558ef551
parent db7e1bc479cc941c53839b18ff811c7def0c52e7
author Linus Torvalds <torvalds@linux-foundation.org> 1272586655 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1272586655 -0700

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6061/1: PL061 GPIO: Bug fix - setting gpio for HIGH_LEVEL interrupt is not working.
  ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIB
  ARM: 6030/1: KS8695: enable console
  ARM: 6060/1: PL061 GPIO: Setting gpio val after changing direction to OUT.
  ARM: 6059/1: PL061 GPIO: Changing *_irq_chip_data with *_irq_data for real irqs.
  ARM: 6023/1: update bcmring_defconfig to latest version and fix build error
  ARM: fix build error in arch/arm/kernel/process.c