The following commit has been merged in the linux branch: commit 131edb3418018b6da297ed389b541e697043a8b6 Author: Andy Whitcroft apw@canonical.com Date: Mon Oct 26 16:50:14 2009 -0700

checkpatch: update copyright dates

Signed-off-by: Andy Whitcroft apw@canonical.com Signed-off-by: Andrew Morton akpm@linux-foundation.org Signed-off-by: Linus Torvalds torvalds@linux-foundation.org

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 1eca1e1..05b10d6 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2,7 +2,7 @@ # (c) 2001, Dave Jones. davej@redhat.com (the file handling bit) # (c) 2005, Joel Schopp jschopp@austin.ibm.com (the ugly bit) # (c) 2007,2008, Andy Whitcroft apw@uk.ibm.com (new conditions, test suite) -# (c) 2008, Andy Whitcroft apw@canonical.com +# (c) 2008,2009, Andy Whitcroft apw@canonical.com # Licensed under the terms of the GNU GPL License version 2

use strict;