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.
No related branches found
No related tags found
Showing
- arch/arm/mach-pxa/include/mach/pxafb.h 1 addition, 0 deletionsarch/arm/mach-pxa/include/mach/pxafb.h
- arch/arm/mach-pxa/reset.c 4 additions, 3 deletionsarch/arm/mach-pxa/reset.c
- arch/arm/mach-pxa/spitz.c 2 additions, 2 deletionsarch/arm/mach-pxa/spitz.c
- drivers/video/pxafb.c 4 additions, 1 deletiondrivers/video/pxafb.c
Loading
Please register or sign in to comment