Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Thu, 11 Jun 2009 06:01:14 +0000 (09:01 +0300)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 11 Jun 2009 06:01:14 +0000 (09:01 +0300)
commitcf9fe114e3b37e14fc8434d5abb192e35df551b1
tree0f82879295dc792f9df1a3ce79e143a3c073510f
parentc1d0d32a603ed06377f404adf2c538de33bb3634
parent991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
kernel/time/timekeeping.c