aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-20 13:38:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-20 13:38:28 -0700
commit102dc1bae12a20214c9ee2d33a7402dc5175e30d (patch)
treedbc2364c164db3743bd86ff02557369daac0fac4 /fs
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff)
parentMAINTAINERS: Add drivers/clocksource to TIMEKEEPING (diff)
downloadlinux-dev-102dc1bae12a20214c9ee2d33a7402dc5175e30d.tar.xz
linux-dev-102dc1bae12a20214c9ee2d33a7402dc5175e30d.zip
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: MAINTAINERS: Add drivers/clocksource to TIMEKEEPING clockevents/source: Use u64 to make 32bit happy
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions