projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 13d428a 28105fd)
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)
commited313489badef16d700f5a3be50e8fd8f8294bc8
treea42627a517aad432f0ce19b670003439b7c5a15btree | snapshot
parent13d428afc007fcfcd6deeb215618f54cf9c0cae6commit | diff
parent28105fda1ecadfa7c827b22d323c169f19dc04b0commit | diff
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.
John Crispins staging tree