summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-01-07 15:40:05 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-01-07 15:40:05 +0100
commit123656d4cc8c946f578ebd18c2050f5251720428 (patch)
tree3d5432eff034a3b9cfdc98b37e245abe5695342d /CREDITS
parent[ARM] Move AMBA include files to include/linux/amba/ (diff)
parent[PATCH] Fix posix-cpu-timers sched_time accumulation (diff)
downloadlinux-123656d4cc8c946f578ebd18c2050f5251720428.tar.xz
linux-123656d4cc8c946f578ebd18c2050f5251720428.zip
Merge with Linus' kernel.
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS1
1 files changed, 1 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 1b4f8694fa48..521f00d1b549 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1883,6 +1883,7 @@ N: Jaya Kumar
E: jayalk@intworks.biz
W: http://www.intworks.biz
D: Arc monochrome LCD framebuffer driver, x86 reboot fixups
+D: pirq addr, CS5535 alsa audio driver
S: Gurgaon, India
S: Kuala Lumpur, Malaysia