From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Nov 2008 02:08:09 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~16725
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2.6.28-rc6-00007-ged31348;p=firefly-linux-kernel-4.4.55.git

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.
---

ed313489badef16d700f5a3be50e8fd8f8294bc8