]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 17:00:55 +0000 (09:00 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 17:00:55 +0000 (09:00 -0800)
1  2 
drivers/char/vr41xx_rtc.c
drivers/serial/vr41xx_siu.c

Simple merge
Simple merge