diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-01 10:05:49 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-01 10:05:49 -0300 |
| commit | 4adb473e91f8b90f20f44293cdcda2843d9e1a6f (patch) | |
| tree | fd15cd6f9082b955a4cb6ab4b9338b23b5272fda /linux/drivers/media/video/saa7134 | |
| parent | b4abf6c771eaf89639bc5ec457b0aedcbfda25bf (diff) | |
| download | mediapointer-dvb-s2-4adb473e91f8b90f20f44293cdcda2843d9e1a6f.tar.gz mediapointer-dvb-s2-4adb473e91f8b90f20f44293cdcda2843d9e1a6f.tar.bz2 | |
do_merge.pl: make easier to identify merge troubles
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
0 files changed, 0 insertions, 0 deletions