diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-04 08:33:18 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-04 08:33:18 +0300 |
| commit | 66ef3493d4bb387f5a83915e33dc893102fd1b43 (patch) | |
| tree | 2bd8a29781dce25d610c3bd058c0dd2a4139856f /include/linux/nvme.h | |
| parent | 639ab3eb38c6e92e27e061551dddee6dd3bbb5d2 (diff) | |
| parent | d1f0f6c72c14af8a27a6549e0623f7cd61805e83 (diff) | |
| download | linux-66ef3493d4bb387f5a83915e33dc893102fd1b43.tar.xz | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform changes from Ingo Molnar:
"Misc updates to the Intel MID and SGI UV platforms"
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/intel-mid: Make intel_mid_ops static
arch/x86/intel-mid: Use kmemdup rather than duplicating its implementation
x86/platform/uv: Implement simple dump failover if kdump fails
x86/platform/uv: Insert per_cpu accessor function on uv_hub_nmi
Diffstat (limited to 'include/linux/nvme.h')
0 files changed, 0 insertions, 0 deletions