Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Wed, 22 Apr 2009 00:27:47 +0000 (09:27 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 22 Apr 2009 00:27:47 +0000 (09:27 +0900)
commit99ce567ba912109c78762246c964327f3f81f27d
tree685265d60792c11d386db6c005ca8b8e714ecc23
parent8fb2bae4b41eb64f6e233e9bd3f3a789fbb04a06
parentccc5ff94c66e628d3c501b26ace5d4339667715d
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
arch/sh/kernel/time_32.c