tree 71fc6918e676a0cf53d585f5a253646a49b60c83
parent d1ca1a004822983e2fc702d5382b4b9a5527cfbe
parent 24109afd17426e1a2b72141e4a2b730057e1a0ea
author Linus Torvalds <torvalds@linux-foundation.org> 1310505591 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1310505591 -0700

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  pcmcia: pxa2xx/vpac270: free gpios on exist rather than requesting
  ARM: pxa/raumfeld: fix device name for codec ak4104
  ARM: pxa/raumfeld: display initialisation fixes
  ARM: pxa/raumfeld: adapt to upcoming hardware change
  ARM: pxa: fix gpio_to_chip() clash with gpiolib namespace
  genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)
  arm: mach-vt8500: add forgotten irq_data conversion
  ARM: pxa168: correct nand pmu setting
  ARM: pxa910: correct nand pmu setting
  ARM: pxa: fix PGSR register address calculation