diff options
| author | Ingo Molnar | 2014-01-12 14:13:31 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2014-01-12 14:13:31 +0100 |
| commit | d05d24a984f8e14086771a158083dbe6facb769e (patch) | |
| tree | 0e897dc8cee3b884eef194b620c62d8a8fa8594c /fs/gfs2/glops.c | |
| parent | dba861461f88c12249ac78fb877866c04f99deb3 (diff) | |
| parent | 38aef31ce7773624c8f09ff58c4c27b3b955faaf (diff) | |
Merge branch 'fortglx/3.14/time' of git://git.linaro.org/people/john.stultz/linux into timers/core
Pull timekeeping updates from John Stultz.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/gfs2/glops.c')
0 files changed, 0 insertions, 0 deletions