linux-phytec-fsl

Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non-critical

Non-critical fixes for PXA, from Haojian Zhuang.

* 'armsoc/fix' of git://github.com/hzhuang1/linux:
  ARM: pxa: Minor naming fixes in spitz.c
  ARM: PXA3xx: program the CSMSADRCFG register
  ARM: palmtreo: fix #ifdefs for leds-gpio device
  ARM: palmtreo: fix lcd initilialization on treo680

Signed-off-by: Olof Johansson <olof@lixom.net>