Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Paul Mundt [Thu, 11 Jun 2009 06:01:14 +0000 (09:01 +0300)]
1  2 
kernel/time/timekeeping.c

Simple merge