diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
| commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
| tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /Documentation/video4linux/gspca.txt | |
| parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/video4linux/gspca.txt')
| -rw-r--r-- | Documentation/video4linux/gspca.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt index 0c4880af57a..bcaf4ab383b 100644 --- a/Documentation/video4linux/gspca.txt +++ b/Documentation/video4linux/gspca.txt | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | List of the webcams know by gspca. | 1 | List of the webcams known by gspca. |
| 2 | 2 | ||
| 3 | The modules are: | 3 | The modules are: |
| 4 | gspca_main main driver | 4 | gspca_main main driver |