]> git.baikalelectronics.ru Git - kernel.git/commit
Merge commit 'a464723963dc660b78e8041ea9f88790d2e5b85a'
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)
commit6517db175e1f3ae203ebfbc4cba1a42bdb47cbe2
treec5568365f32386559d2710e8981ed41e5fe0eb12
parent5073c81bfb82aa7a21c6c314f1c531a2b86de09f
parenta464723963dc660b78e8041ea9f88790d2e5b85a
Merge commit 'a464723963dc660b78e8041ea9f88790d2e5b85a'

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