diff --git a/[refs] b/[refs] index aa5d8eb08809..1aa29bfdd72f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b976fe19acc565e5137e6f12af7b6633a23e6b7c +refs/heads/master: ba9b1cd713b33720ca0f035dab2fdbc10bf7328d diff --git a/trunk/CREDITS b/trunk/CREDITS index 606d407cfc15..ccd4f9f4dd71 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -3511,14 +3511,12 @@ D: The Linux Support Team Erlangen N: David Weinehall E: tao@acc.umu.se +P: 1024D/DC47CA16 7ACE 0FB0 7A74 F994 9B36 E1D1 D14E 8526 DC47 CA16 W: http://www.acc.umu.se/~tao/ -W: http://www.acc.umu.se/~mcalinux/ +D: v2.0 kernel maintainer D: Fixes for the NE/2-driver D: Miscellaneous MCA-support D: Cleanup of the Config-files -S: Axtorpsvagen 40:20 -S: S-903 37 UMEA -S: Sweden N: Matt Welsh E: mdw@metalab.unc.edu