diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-19 18:17:35 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-19 18:17:35 +0200 |
commit | e91dade52b590d821e83bb494df20c93e5384790 (patch) | |
tree | 256ed456cb1d21776624020485ce1a79814db29d /fs/gfs2/main.c | |
parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
parent | Merge branch 'fortglx/3.11/time' of git://git.linaro.org/people/jstultz/linux... (diff) | |
download | linux-e91dade52b590d821e83bb494df20c93e5384790.tar.xz linux-e91dade52b590d821e83bb494df20c93e5384790.zip |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Ingo Molnar:
"Three small fixlets"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
nohz: fix compile warning in tick_nohz_init()
nohz: Do not warn about unstable tsc unless user uses nohz_full
sched_clock: Fix integer overflow
Diffstat (limited to 'fs/gfs2/main.c')
0 files changed, 0 insertions, 0 deletions