git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pm-next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman...
[sfrench/cifs-2.6.git]
/
CREDITS
diff --git
a/CREDITS
b/CREDITS
index 1a41bf4addd0689c9bd7243c80712ee409da9310..72b487869788c14cd40e9535b700f4be166aa12b 100644
(file)
--- a/
CREDITS
+++ b/
CREDITS
@@
-2800,7
+2800,7
@@
D: Starter of Linux1394 effort
S: ask per mail for current address
N: Nicolas Pitre
-E: nico@
cam.org
+E: nico@
fluxnic.net
D: StrongARM SA1100 support integrator & hacker
D: Xscale PXA architecture
D: unified SMC 91C9x/91C11x ethernet driver (smc91x)