summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-10-11 13:45:22 +0200
committerTakashi Iwai <tiwai@suse.de>2010-10-11 13:45:22 +0200
commit4e83998f5af010a928495988c586ea2926624db9 (patch)
treee72d346172a30bbee165d7f585784724906da416 /CREDITS
parentALSA: oxygen - Add a SSID for CMI8787-HG2PCI (diff)
parentOSS: soundcard: locking bug in sound_ioctl() (diff)
downloadlinux-4e83998f5af010a928495988c586ea2926624db9.tar.xz
linux-4e83998f5af010a928495988c586ea2926624db9.zip
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS8
1 files changed, 4 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index 72b487869788..41d8e63d5165 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3554,12 +3554,12 @@ E: cvance@nai.com
D: portions of the Linux Security Module (LSM) framework and security modules
N: Petr Vandrovec
-E: vandrove@vc.cvut.cz
+E: petr@vandrovec.name
D: Small contributions to ncpfs
D: Matrox framebuffer driver
-S: Chudenicka 8
-S: 10200 Prague 10, Hostivar
-S: Czech Republic
+S: 21513 Conradia Ct
+S: Cupertino, CA 95014
+S: USA
N: Thibaut Varene
E: T-Bone@parisc-linux.org