summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-08-04 13:58:28 +0200
committerIngo Molnar <mingo@elte.hu>2009-08-04 13:58:28 +0200
commite16852cfc5580b88cb327413ab8c89375f380592 (patch)
tree67e7d5b84e2602986f2da689625e5a25d7af7bb4 /CREDITS
parentbdff78707f3ce47e891f3201c9666122a70556ce (diff)
parent74e7ff8c50b6b022e6ffaa736b16a4dc161d3eaf (diff)
downloadlinux-3.10-e16852cfc5580b88cb327413ab8c89375f380592.tar.gz
linux-3.10-e16852cfc5580b88cb327413ab8c89375f380592.tar.bz2
linux-3.10-e16852cfc5580b88cb327413ab8c89375f380592.zip
Merge branch 'tracing/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/urgent
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS2
1 files changed, 1 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index 2b88fb37ad5..e76d300e9fe 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1856,7 +1856,7 @@ E: rfkoenig@immd4.informatik.uni-erlangen.de
D: The Linux Support Team Erlangen
N: Andreas Koensgen
-E: ajk@iehk.rwth-aachen.de
+E: ajk@comnets.uni-bremen.de
D: 6pack driver for AX.25
N: Harald Koerfgen