Merge branch 'linus' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Thu, 15 Jan 2009 14:45:31 +0000 (15:45 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 15 Jan 2009 14:45:31 +0000 (15:45 +0100)
commit49a93bc978b4b3d564f6b330179b4cc2724a031d
tree8b14b6c1d32b2a64bd9e7d0793717780ecc1d985
parent54da5b3d44238eeb7417bacf792fb416d473bf4d
parenta6525042bfdfcab128bd91fad264de10fd24a55e
Merge branch 'linus' into cpus4096
arch/sparc/kernel/time_64.c