Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Paul Mundt [Wed, 22 Apr 2009 00:27:47 +0000 (09:27 +0900)]
1  2 
arch/sh/kernel/time_32.c

Simple merge