Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

author Linus Torvalds <[email protected]>

Tue, 10 Jan 2006 17:00:55 +0000 (09:00 -0800)

committer Linus Torvalds <[email protected]>

Tue, 10 Jan 2006 17:00:55 +0000 (09:00 -0800)
author Linus Torvalds <[email protected]>
Tue, 10 Jan 2006 17:00:55 +0000 (09:00 -0800)
committer Linus Torvalds <[email protected]>
Tue, 10 Jan 2006 17:00:55 +0000 (09:00 -0800)
diff --cc drivers/char/vr41xx_rtc.c
Simple merge
diff --cc drivers/serial/vr41xx_siu.c
Simple merge
author	Linus Torvalds <[email protected]>
	Tue, 10 Jan 2006 17:00:55 +0000 (09:00 -0800)
committer	Linus Torvalds <[email protected]>
	Tue, 10 Jan 2006 17:00:55 +0000 (09:00 -0800)
		1	2
drivers/char/vr41xx_rtc.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/serial/vr41xx_siu.c	patch \|	diff1 \|	diff2 \|	blob \| history