Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

diff --cc arch/arm/mach-pxa/include/mach/hardware.h
Simple merge

diff --cc arch/arm/mach-pxa/time.c
index ef4ddf9,986d494..0016241
--- 1/arch/arm/mach-pxa/time.c
--- 2/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
@@@ -22,9 -22,7 +22,8 @@@
  #include <asm/div64.h>
  #include <asm/mach/irq.h>
  #include <asm/mach/time.h>
 +#include <mach/hardware.h>
  #include <mach/pxa-regs.h>
- #include <asm/mach-types.h>
  
  /*
   * This is PXA's sched_clock implementation. This has a resolution

diff --cc drivers/video/Kconfig
Simple merge

diff --cc drivers/video/pxafb.c
Simple merge

diff --cc drivers/watchdog/sa1100_wdt.c
Simple merge