summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-24 07:59:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-24 07:59:17 -0700
commitc3ed9ea4ab460080dea9449c709be9316c670c72 (patch)
tree8330e32353e132b090472751161325baf4e27133 /fs
parent0fed2b5cb4c04336b26b0cbf6f9a8c07081f79a6 (diff)
parentf00e047efdf9d31c8a7dd7875b411f97cfa7d8e5 (diff)
downloadop-kernel-dev-c3ed9ea4ab460080dea9449c709be9316c670c72.zip
op-kernel-dev-c3ed9ea4ab460080dea9449c709be9316c670c72.tar.gz
Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: timers: Fix slack calculation for expired timers timekeeping: Fix timezone update
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud