]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 10 Nov 2005 15:37:51 +0000 (07:37 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 10 Nov 2005 15:37:51 +0000 (07:37 -0800)
1  2 
arch/powerpc/kernel/smp.c

Simple merge