summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-02-17 14:11:15 +0100
committerIngo Molnar <mingo@elte.hu>2011-02-17 14:11:15 +0100
commit5beda5f6e4e4523e8dbe596bf163a01b45776808 (patch)
tree61d1551430687b712325cdfec81b7800aa759076 /scripts
parentba3dd36c6775264ee6e7354ba1aabcd6e86d7298 (diff)
parent6752ab4a9c30d5411b2dfdb251a3f1cb18aae487 (diff)
downloadlinux-3.10-5beda5f6e4e4523e8dbe596bf163a01b45776808.tar.gz
linux-3.10-5beda5f6e4e4523e8dbe596bf163a01b45776808.tar.bz2
linux-3.10-5beda5f6e4e4523e8dbe596bf163a01b45776808.zip
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/streamline_config.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index fd81fc33d63..a4fe923c013 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
#
-# Copywrite 2005-2009 - Steven Rostedt
+# Copyright 2005-2009 - Steven Rostedt
# Licensed under the terms of the GNU GPL License version 2
#
# It's simple enough to figure out how this works.