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)
commitbf785ee0aeea7a3e717cb1e11df4135b6cbde7da
tree32ae52ad51c2a3952f2e1a2af9217717954fa593
parent8b87e1baff24e586c3fe6c168843d213119bf4dd
parent00431707be0cc1236ee08459367872b57da5be29
Merge master.kernel.org:/home/rmk/linux-2.6-arm
arch/arm/common/rtctime.c
drivers/serial/Kconfig