Merge commit 'v2.6.29-rc1' into timers/hrtimers

Conflicts:
	kernel/time/tick-common.c

1 files changed, 2 insertions, 1 deletions

diff --git a/kernel/signal.c b/kernel/signal.c
index 8e95855ff3cf..3152ac3b62e2 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -858,7 +858,8 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
                         q->info.si_signo = sig;
                         q->info.si_errno = 0;
                         q->info.si_code = SI_USER;
-                        q->info.si_pid = task_pid_vnr(current);
+                        q->info.si_pid = task_tgid_nr_ns(current,
+                                                        task_active_pid_ns(t));
                         q->info.si_uid = current_uid();
                         break;
                 case (unsigned long) SEND_SIG_PRIV: