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