diff options
| author | Linus Torvalds | 2014-06-04 00:48:23 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-06-04 00:48:23 +0200 |
| commit | 3de0ef8d0d3350964720cad2a0a72984f1bb81ba (patch) | |
| tree | 86af0fe2a66c9975d9740e82a7ae1530280b8b38 /mm/swap.c | |
| parent | Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | x86/UV: Fix conditional in gru_exit() (diff) | |
| download | kernel-qcow2-linux-3de0ef8d0d3350964720cad2a0a72984f1bb81ba.tar.gz kernel-qcow2-linux-3de0ef8d0d3350964720cad2a0a72984f1bb81ba.tar.xz kernel-qcow2-linux-3de0ef8d0d3350964720cad2a0a72984f1bb81ba.zip | |
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 'mm/swap.c')
0 files changed, 0 insertions, 0 deletions