Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'
authorDavid S. Miller <davem@davemloft.net>
Fri, 20 May 2011 20:10:22 +0000 (13:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 May 2011 20:10:22 +0000 (13:10 -0700)
commit90d3ac15e5c637d45849e83c828ed78c62886737
treec5568365f32386559d2710e8981ed41e5fe0eb12
parent9fafbd806198eb690c9a9f9fe35a879db93a1b8d
parent317f394160e9beb97d19a84c39b7e5eb3d7815a8
Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'

Conflicts:
arch/sparc/kernel/smp_32.c

With merge conflict help from Daniel Hellstrom.

Signed-off-by: David S. Miller <davem@davemloft.net>
arch/blackfin/mach-common/smp.c
arch/sparc/kernel/smp_32.c
arch/sparc/kernel/smp_64.c
include/linux/sched.h
kernel/sched.c