Merge master.kernel.org:/home/rmk/linux-2.6-arm

diff --cc arch/arm/common/rtctime.c
index ffb82d5,00f6278..48b1e19
--- 1/arch/arm/common/rtctime.c
--- 2/arch/arm/common/rtctime.c
+++ b/arch/arm/common/rtctime.c
@@@ -17,8 -17,8 +17,9 @@@
  #include <linux/proc_fs.h>
  #include <linux/miscdevice.h>
  #include <linux/spinlock.h>
 +#include <linux/capability.h>
  #include <linux/device.h>
+ #include <linux/mutex.h>
  
  #include <asm/rtc.h>
  #include <asm/semaphore.h>

diff --cc drivers/serial/Kconfig
Simple merge