Merge branch 'for-rmk' of...

Documentation/arm/pxa/mfp.txt

Documentation/fb/pxafb.txt

arch/arm/mach-pxa/generic.c

arch/arm/mach-pxa/include/mach/hardware.h

arch/arm/mach-pxa/include/mach/mfp-pxa930.h

arch/arm/mach-pxa/include/mach/pxafb.h

arch/arm/mach-pxa/include/mach/regs-lcd.h

arch/arm/mach-pxa/include/mach/timex.h

arch/arm/mach-pxa/tavorevb.c

arch/arm/mach-pxa/time.c

arch/arm/mach-sa1100/include/mach/hardware.h

drivers/rtc/rtc-sa1100.c

drivers/video/Kconfig

drivers/video/pxafb.c

drivers/video/pxafb.h

drivers/watchdog/sa1100_wdt.c