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

This commit is contained in:
Linus Torvalds
2006-01-10 09:00:55 -08:00
98 changed files with 286 additions and 191 deletions

View File

@@ -1,7 +1,7 @@
/*
* Driver for NEC VR4100 series Serial Interface Unit.
*
* Copyright (C) 2004-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
* Copyright (C) 2004-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
*
* Based on drivers/serial/8250.c, by Russell King.
*