diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-03 15:03:05 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-03 15:03:05 +1000 |
| commit | f3502ff5360a23e897b04215278de0fc2ba28fcd (patch) | |
| tree | ddef124c9170c3e2e2f6a6dbae7af2f2a6e3c7fe /include/media/v4l2-dev.h | |
| parent | dd453950b674145f26a351f6da7b488c7dc34337 (diff) | |
| parent | dc327fb0ceb8c4f9309dbc166dd0b3f6d4dd2d38 (diff) | |
Merge branch 'quilt/rr'
Conflicts:
drivers/char/hvc_console.h
kernel/stop_machine.c
Diffstat (limited to 'include/media/v4l2-dev.h')
0 files changed, 0 insertions, 0 deletions