diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-25 10:09:33 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-25 10:09:33 -0200 |
| commit | dc6e8817d776cdb670fd1db1cb48f2ee25c91717 (patch) | |
| tree | 677d3c5ec66470c67ef759f05bc10651b19be25e /linux/drivers/media/dvb/ttpci/av7110_ca.c | |
| parent | 72fadf90dd75161b532265142351354510a62e3c (diff) | |
| parent | 29dc3ffaee320cff68d0ef8a2d9e2e0f112df29d (diff) | |
| download | mediapointer-dvb-s2-dc6e8817d776cdb670fd1db1cb48f2ee25c91717.tar.gz mediapointer-dvb-s2-dc6e8817d776cdb670fd1db1cb48f2ee25c91717.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
There's something weird with mercurial... sometimes, hg merge doesn't
work. Instead, I need to do:
hg update
hg merge -r <the other head>
hg commit
This way, the diff patch will show what happened with the first head,
instead of the merging changes added by the newer one :(
Anyway, since each individual patch can be seem at the history, it will
work.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110_ca.c')
0 files changed, 0 insertions, 0 deletions