aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-01-07 09:40:05 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-01-07 09:40:05 -0500
commit123656d4cc8c946f578ebd18c2050f5251720428 (patch)
tree3d5432eff034a3b9cfdc98b37e245abe5695342d /CREDITS
parenta62c80e559809e6c7851ec04d30575e85ad6f6ed (diff)
parent0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff)
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
1883E: jayalk@intworks.biz 1883E: jayalk@intworks.biz
1884W: http://www.intworks.biz 1884W: http://www.intworks.biz
1885D: Arc monochrome LCD framebuffer driver, x86 reboot fixups 1885D: Arc monochrome LCD framebuffer driver, x86 reboot fixups
1886D: pirq addr, CS5535 alsa audio driver
1886S: Gurgaon, India 1887S: Gurgaon, India
1887S: Kuala Lumpur, Malaysia 1888S: Kuala Lumpur, Malaysia
1888 1889