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

e9d52234 · Linus Torvalds · 955c5038 · 09af7b44 · e9d52234 · e9d52234
Commit e9d52234 authored 19 years ago by Linus Torvalds
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 81 additions and 1 deletion

include/linux/serial_ip3106.h include/linux/serial_ip3106.h +81 -0

sound/oss/au1550_ac97.c sound/oss/au1550_ac97.c +0 -1

No files found.
--- a/include/linux/serial_ip3106.h
+++ b/include/linux/serial_ip3106.h
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c