From 993b84b81732121fd8953d0fb4429415290efba9 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 9 Oct 2005 03:35:25 +0000 Subject: From: Mauro Carvalho Chehab * ../Make - created make changelog to make easier to generate patches. * ../linux/drivers/media/video/cx88/cx88-core.c: * ../linux/drivers/media/video/cx88/cx88.h: * ../linux/kernel/drivers/usb/media/em2820-core.c: * ../linux/kernel/drivers/usb/media/em2820-i2c.c: * ../linux/kernel/drivers/usb/media/em2820-video.c: * ../linux/kernel/drivers/usb/media/em2820.h: - removed unneccessary includes. * ../v4l/scripts/prepare-ChangeLog.pl: - Modified to avoid detecting ChangeLog as a change. Signed-off-by: Mauro Carvalho Chehab --- v4l/ChangeLog | 18 ++++++++++++++++++ v4l/scripts/prepare-ChangeLog.pl | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) (limited to 'v4l') diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 42a3365c0..8f6fa3b7c 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,21 @@ +2005-10-09 03:31 mchehab + + * ../Makefile: + - created make changelog to make easier to generate patches. + + * ../linux/drivers/media/video/cx88/cx88-core.c: + * ../linux/drivers/media/video/cx88/cx88.h: + * ../linux/kernel/drivers/usb/media/em2820-core.c: + * ../linux/kernel/drivers/usb/media/em2820-i2c.c: + * ../linux/kernel/drivers/usb/media/em2820-video.c: + * ../linux/kernel/drivers/usb/media/em2820.h: + - removed unneccessary includes. + + * ../v4l/scripts/prepare-ChangeLog.pl: + - Modified to avoid detecting ChangeLog as a change. + + Signed-off-by: Mauro Carvalho Chehab + 2005-10-08 03:24 mkrufky * ../v4l/scripts/merge-trees.sh: diff --git a/v4l/scripts/prepare-ChangeLog.pl b/v4l/scripts/prepare-ChangeLog.pl index a479c6999..f464d7573 100644 --- a/v4l/scripts/prepare-ChangeLog.pl +++ b/v4l/scripts/prepare-ChangeLog.pl @@ -95,7 +95,7 @@ while () { $file = $1 if /^Index: (\S+)$/; if (defined $file - and $file ne "ChangeLog" + and $file ne "../v4l/ChangeLog" and (/^\d+(,\d+)?[acd](\d+)(,(\d+))?/ or /^Binary files/) ) { push @{$changed_line_ranges{$file}}, [ $2, $4 || $2 ]; -- cgit v1.2.3