aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 11:25:57 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 11:25:57 -0400
commit50cb993ea6cd187bfed085cb3e0747066edeb02f (patch)
tree61edac62c6c5bc07c59e4369c50c6821ad77f2c0 /CREDITS
parent445c2714cf72817ab1ad3ca894c6d9b2047b3a3e (diff)
parent8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff)
Merge ../linux-2.6
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS8
1 files changed, 8 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 077b147388bd..c62dcb3b7e26 100644
--- a/CREDITS
+++ b/CREDITS
@@ -317,6 +317,14 @@ S: 2322 37th Ave SW
317S: Seattle, Washington 98126-2010 317S: Seattle, Washington 98126-2010
318S: USA 318S: USA
319 319
320N: Muli Ben-Yehuda
321E: mulix@mulix.org
322E: muli@il.ibm.com
323W: http://www.mulix.org
324D: trident OSS sound driver, x86-64 dma-ops and Calgary IOMMU,
325D: KVM and Xen bits and other misc. hackery.
326S: Haifa, Israel
327
320N: Johannes Berg 328N: Johannes Berg
321E: johannes@sipsolutions.net 329E: johannes@sipsolutions.net
322W: http://johannes.sipsolutions.net/ 330W: http://johannes.sipsolutions.net/