tree a42627a517aad432f0ce19b670003439b7c5a15b
parent 13d428afc007fcfcd6deeb215618f54cf9c0cae6
parent 28105fda1ecadfa7c827b22d323c169f19dc04b0
author Linus Torvalds <torvalds@linux-foundation.org> 1227233289 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1227233289 -0800

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5330/1: mach-pxa: Fixup reset for systems using reboot=cold or other strings
  [ARM] pxa: fix incorrect PCMCIA PSKTSEL pin configuration for spitz
  [ARM] pxa: fix I2C controller device being registered twice on Akita
  pxafb: only initialize the smart panel thread when dealing with a smartpanel
  pxafb: introduce LCD_TYPE_MASK and use it.