aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorNathan Scott <nathans@bruce>2006-03-21 23:31:14 -0500
committerNathan Scott <nathans@bruce>2006-03-21 23:31:14 -0500
commit4d74f423c722b8cadfabe087369200013b217b67 (patch)
treed62facddfdb0dfd89f3e61f4fc699cf2feb4b082 /CREDITS
parentbb19fba1937cb6ab2bb98ac893365f6ebf88ef1b (diff)
parente952f31bce6e9f64db01f607abc46529ba57ac9e (diff)
Merge HEAD from ../linux-2.6
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS3
1 files changed, 2 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index 64511e2abc8e..af70678a0afd 100644
--- a/CREDITS
+++ b/CREDITS
@@ -120,7 +120,6 @@ D: Author of lil (Linux Interrupt Latency benchmark)
120D: Fixed the shm swap deallocation at swapoff time (try_to_unuse message) 120D: Fixed the shm swap deallocation at swapoff time (try_to_unuse message)
121D: VM hacker 121D: VM hacker
122D: Various other kernel hacks 122D: Various other kernel hacks
123S: Via Cicalini 26
124S: Imola 40026 123S: Imola 40026
125S: Italy 124S: Italy
126 125
@@ -2814,6 +2813,8 @@ E: luca.risolia@studio.unibo.it
2814P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958 5D40 99DA 5D2A FCE6 35A4 2813P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958 5D40 99DA 5D2A FCE6 35A4
2815D: V4L driver for W996[87]CF JPEG USB Dual Mode Camera Chips 2814D: V4L driver for W996[87]CF JPEG USB Dual Mode Camera Chips
2816D: V4L2 driver for SN9C10x PC Camera Controllers 2815D: V4L2 driver for SN9C10x PC Camera Controllers
2816D: V4L2 driver for ET61X151 and ET61X251 PC Camera Controllers
2817D: V4L2 driver for ZC0301 Image Processor and Control Chip
2817S: Via Liberta' 41/A 2818S: Via Liberta' 41/A
2818S: Osio Sotto, 24046, Bergamo 2819S: Osio Sotto, 24046, Bergamo
2819S: Italy 2820S: Italy