Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 20 May 2011 19:59:54 +0000 (12:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 May 2011 19:59:54 +0000 (12:59 -0700)
commit9fafbd806198eb690c9a9f9fe35a879db93a1b8d
treea555f39102d51151d7f8461a4f575468cd52f33c
parentd81f087f1f1c1aacdb4f17224a554237285ddd11
parent21dccddf45aae2d9f973696ce06115da0d1012b6
Merge branch 'master' of /linux/kernel/git/davem/sparc-2.6
arch/sparc/kernel/smp_32.c
arch/sparc/kernel/time_32.c