diff -ura xx-linux-2.6.0-test6/CREDITS linux-2.6.0-test6/CREDITS
--- xx-linux-2.6.0-test6/CREDITS	2003-10-04 21:06:38.000000000 +0200
+++ linux-2.6.0-test6/CREDITS	2003-10-04 21:29:59.000000000 +0200
@@ -1459,6 +1459,13 @@
 S: Roscommon
 S: Ireland
 
+N: Michael Hunold
+E: michael@mihu.de
+W: http://www.mihu.de/linux/
+D: Generic saa7146 video4linux-2 driver core,
+D: Driver for the "Multimedia eXtension Board", "dpc7146",
+D: "Hexium Orion", "Hexium Gemini"
+
 N: Miguel de Icaza Amozurrutia
 E: miguel@nuclecu.unam.mx
 D: Linux/SPARC team, Midnight Commander maintainer
diff -ura xx-linux-2.6.0-test6/Documentation/ioctl-number.txt linux-2.6.0-test6/Documentation/ioctl-number.txt
--- xx-linux-2.6.0-test6/Documentation/ioctl-number.txt	2003-10-04 21:06:09.000000000 +0200
+++ linux-2.6.0-test6/Documentation/ioctl-number.txt	2003-10-04 21:26:50.000000000 +0200
@@ -175,10 +175,6 @@
 					<mailto:buk@buks.ipn.de>
 0xA0	all	linux/sdp/sdp.h		Industrial Device Project
 					<mailto:kenji@bitgate.com>
-0xA2    00-0F   DVD decoder driver      in development:
-                                        <http://linuxtv.org/developer/dvdapi.html>
-0xA3	00-1F	Philips SAA7146 dirver	in development:
-					<mailto:Andreas.Beckmann@hamburg.sc.philips.com>
 0xA3	80-8F	Port ACL		in development:
 					<mailto:tlewis@mindspring.com>
 0xA3	90-9F	linux/dtlk.h
diff -ura xx-linux-2.6.0-test6/MAINTAINERS linux-2.6.0-test6/MAINTAINERS
--- xx-linux-2.6.0-test6/MAINTAINERS	2003-10-04 21:06:38.000000000 +0200
+++ linux-2.6.0-test6/MAINTAINERS	2003-10-04 21:17:14.000000000 +0200
@@ -669,6 +669,12 @@
 M:	romieu@ensta.fr
 S:	Maintained
 
+DVB SUBSYSTEM AND DRIVERS
+P:	LinuxTV.org Project
+L: 	linux-dvb@linuxtv.org
+W:	http://linuxtv.org/developer/dvb.xml
+S:	Supported
+
 EATA-DMA SCSI DRIVER
 P:	Michael Neuffer
 L:	linux-eata@i-connect.net, linux-scsi@vger.kernel.org
@@ -1658,6 +1664,12 @@
 W:	http://oss.software.ibm.com/developerworks/opensource/linux390
 S:	Supported
 
+SAA7146 VIDEO4LINUX-2 DRIVER
+P:	Michael Hunold
+M:	michael@mihu.de
+W:	http://www.mihu.de/linux/saa7146
+S:	Maintained
+
 SA1100 SUPPORT
 P:	Nicolas Pitre
 M:	nico@cam.org