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)
commitd936cfc72032fb4af03d1edd99596d18ea1f081c
tree6d524c57fbff717ba82c6f4925659f6ec901d45d
parent4f47707b056bd2e3627ef390557ee93d312daba5
parentadfc76419bff33542d4fd53dc7f24818f846f194
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus
drivers/char/vr41xx_rtc.c
drivers/serial/vr41xx_siu.c