]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 20:23:49 +0000 (12:23 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 20:23:49 +0000 (12:23 -0800)
1  2 
arch/arm/common/rtctime.c
drivers/serial/Kconfig

index ffb82d5bedefaff24f5deb53e6215b16f333e65a,00f6278f42b86c58d207997309f4ab5697a8b9b9..48b1e19b131f938faeed9b53bc4bb9e19d1438bc
@@@ -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>
Simple merge