diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 15:48:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 15:48:23 -0700 |
| commit | 3de0ef8d0d3350964720cad2a0a72984f1bb81ba (patch) | |
| tree | 86af0fe2a66c9975d9740e82a7ae1530280b8b38 /drivers/clocksource/versatile.c | |
| parent | 06b77b97338e906e8af73a9b5f97b9162aac239d (diff) | |
| parent | fe455b17de6c881eecf4f9784c3b0483a5e3d19e (diff) | |
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
Pull x86/UV changes from Ingo Molnar:
"Continued updates for SGI UV 3 hardware support"
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/UV: Fix conditional in gru_exit()
x86/UV: Set n_lshift based on GAM_GR_CONFIG MMR for UV3
Diffstat (limited to 'drivers/clocksource/versatile.c')
0 files changed, 0 insertions, 0 deletions