Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
David S. Miller [Fri, 20 May 2011 19:59:54 +0000 (12:59 -0700)]
1  2 
arch/sparc/kernel/smp_32.c
arch/sparc/kernel/time_32.c

Simple merge
Simple merge