diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
| commit | 617677295b53a40d0e54aac4cbbc216ffbc755dd (patch) | |
| tree | 51b9e87213243ed5efff252c8e8d8fec4eebc588 /scripts/kernel-doc | |
| parent | 5c8d1b68e01a144813e38795fe6dbe7ebb506131 (diff) | |
| parent | 6abb7c25775b7fb2225ad0508236d63ca710e65f (diff) | |
Merge branch 'master' into for-next
Conflicts:
drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
Diffstat (limited to 'scripts/kernel-doc')
| -rwxr-xr-x | scripts/kernel-doc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 28b761567815..f565536a2bef 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
| @@ -2079,7 +2079,6 @@ sub dump_function($$) { | |||
| 2079 | $prototype =~ s/^__inline +//; | 2079 | $prototype =~ s/^__inline +//; |
| 2080 | $prototype =~ s/^__always_inline +//; | 2080 | $prototype =~ s/^__always_inline +//; |
| 2081 | $prototype =~ s/^noinline +//; | 2081 | $prototype =~ s/^noinline +//; |
| 2082 | $prototype =~ s/__devinit +//; | ||
| 2083 | $prototype =~ s/__init +//; | 2082 | $prototype =~ s/__init +//; |
| 2084 | $prototype =~ s/__init_or_module +//; | 2083 | $prototype =~ s/__init_or_module +//; |
| 2085 | $prototype =~ s/__must_check +//; | 2084 | $prototype =~ s/__must_check +//; |