]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Nov 2008 02:08:09 +0000 (18:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Nov 2008 02:08:09 +0000 (18:08 -0800)
commit6a7f399dc7dd413e6c12303f3fa8e11caf2c9817
treea42627a517aad432f0ce19b670003439b7c5a15b
parent858b524a546a127f74b5f1e07e15ab5fbd50189f
parent1276c13b89aeb922b654c8e9c27ebc1d4e3b5d04
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.