diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-11 08:19:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-11 08:19:09 -0400 |
| commit | 89034bc2c7b839702c00a704e79d112737f98be0 (patch) | |
| tree | e65b1f3d4c751baa840efc81bc4734f089379eb3 /scripts/package | |
| parent | fb82ad719831db58e9baa4c67015aae3fe27e7e3 (diff) | |
| parent | 85dfd81dc57e8183a277ddd7a56aa65c96f3f487 (diff) | |
Merge branch 'linus' into tracing/core
Conflicts:
kernel/trace/trace_events_filter.c
We use the tracing/core version.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'scripts/package')
| -rw-r--r-- | scripts/package/builddeb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index b19f1f4962e3..8b357b0bd250 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb | |||
| @@ -89,7 +89,7 @@ for script in postinst postrm preinst prerm ; do | |||
| 89 | set -e | 89 | set -e |
| 90 | 90 | ||
| 91 | # Pass maintainer script parameters to hook scripts | 91 | # Pass maintainer script parameters to hook scripts |
| 92 | export DEB_MAINT_PARAMS="\$@" | 92 | export DEB_MAINT_PARAMS="\$*" |
| 93 | 93 | ||
| 94 | test -d $debhookdir/$script.d && run-parts --arg="$version" $debhookdir/$script.d | 94 | test -d $debhookdir/$script.d && run-parts --arg="$version" $debhookdir/$script.d |
| 95 | exit 0 | 95 | exit 0 |