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)
1  2 
arch/sparc/kernel/time_64.c

Simple merge