diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-05-14 06:06:36 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-05-14 06:06:36 -0400 |
| commit | a18f22a968de17b29f2310cdb7ba69163e65ec15 (patch) | |
| tree | a7d56d88fad5e444d7661484109758a2f436129e /scripts/kernel-doc | |
| parent | a1c57e0fec53defe745e64417eacdbd3618c3e66 (diff) | |
| parent | 798778b8653f64b7b2162ac70eca10367cff6ce8 (diff) | |
Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource
Conflicts:
arch/ia64/kernel/cyclone.c
arch/mips/kernel/i8253.c
arch/x86/kernel/i8253.c
Reason: Resolve conflicts so further cleanups do not conflict further
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'scripts/kernel-doc')
| -rwxr-xr-x | scripts/kernel-doc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 9f85012acf0d..d793001929cf 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
| @@ -1705,7 +1705,7 @@ sub push_parameter($$$) { | |||
| 1705 | 1705 | ||
| 1706 | $param = xml_escape($param); | 1706 | $param = xml_escape($param); |
| 1707 | 1707 | ||
| 1708 | # strip spaces from $param so that it is one continous string | 1708 | # strip spaces from $param so that it is one continuous string |
| 1709 | # on @parameterlist; | 1709 | # on @parameterlist; |
| 1710 | # this fixes a problem where check_sections() cannot find | 1710 | # this fixes a problem where check_sections() cannot find |
| 1711 | # a parameter like "addr[6 + 2]" because it actually appears | 1711 | # a parameter like "addr[6 + 2]" because it actually appears |