diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
| commit | e1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4 (patch) | |
| tree | 6a6c805fdfd6a2f6433956cbee348b2c3a277784 /Documentation/video4linux/bttv/CONTRIBUTORS | |
| parent | 944ac4259e39801c843a915c3da8194ac9af0440 (diff) | |
| parent | 7f82f000ed030d1108b4de47d9e2d556092980c6 (diff) | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'Documentation/video4linux/bttv/CONTRIBUTORS')
| -rw-r--r-- | Documentation/video4linux/bttv/CONTRIBUTORS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/video4linux/bttv/CONTRIBUTORS b/Documentation/video4linux/bttv/CONTRIBUTORS index 8aad6dd93d6b..eb41b2650860 100644 --- a/Documentation/video4linux/bttv/CONTRIBUTORS +++ b/Documentation/video4linux/bttv/CONTRIBUTORS | |||
| @@ -3,7 +3,7 @@ Contributors to bttv: | |||
| 3 | Michael Chu <mmchu@pobox.com> | 3 | Michael Chu <mmchu@pobox.com> |
| 4 | AverMedia fix and more flexible card recognition | 4 | AverMedia fix and more flexible card recognition |
| 5 | 5 | ||
| 6 | Alan Cox <alan@redhat.com> | 6 | Alan Cox <alan@lxorguk.ukuu.org.uk> |
| 7 | Video4Linux interface and 2.1.x kernel adaptation | 7 | Video4Linux interface and 2.1.x kernel adaptation |
| 8 | 8 | ||
| 9 | Chris Kleitsch | 9 | Chris Kleitsch |