diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-07-05 02:46:08 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-07-05 02:46:08 -0400 |
| commit | 285eba57db7bd7d7c3c5929fb8621fdcaaea1b00 (patch) | |
| tree | a9e7f0563cef296b24c53b20dbb388ec5c210172 /scripts/rt-tester/rt-tester.py | |
| parent | 1c14e6cecb1811543b1016f27e5d308fbea8c08a (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/serial_sci.h
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'scripts/rt-tester/rt-tester.py')
| -rw-r--r-- | scripts/rt-tester/rt-tester.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/rt-tester/rt-tester.py b/scripts/rt-tester/rt-tester.py index 4c79660793cf..44423b4dcb82 100644 --- a/scripts/rt-tester/rt-tester.py +++ b/scripts/rt-tester/rt-tester.py | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #!/usr/bin/env python | 1 | #!/usr/bin/python |
| 2 | # | 2 | # |
| 3 | # rt-mutex tester | 3 | # rt-mutex tester |
| 4 | # | 4 | # |