diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-01 23:05:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-01 23:05:12 -0700 |
| commit | d19458a4ead14da70c4c852659ccb0234ecd769e (patch) | |
| tree | 865659278bc94f5dbcbc8a9cfb9cd0bbe08eb81c /arch/um/include | |
| parent | 888411be09739443271d254c9d8c1f5188c05509 (diff) | |
| parent | d4d969909bef4c1e103eec0fc2c820773811fb72 (diff) | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform updates from Ingo Molnar:
"Most of the commits are continued SGI UV4 hardware-enablement changes,
plus there's also new Bluetooth support for the Intel Edison platform"
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/platform/intel-mid: Enable Bluetooth support on Intel Edison
x86/platform/uv/BAU: Implement uv4_wait_completion with read_status
x86/platform/uv/BAU: Add wait_completion to bau_operations
x86/platform/uv/BAU: Add status mmr location fields to bau_control
x86/platform/uv/BAU: Cleanup bau_operations declaration and instances
x86/platform/uv/BAU: Add payload descriptor qualifier
x86/platform/uv/BAU: Add uv_bau_version enumerated constants
Diffstat (limited to 'arch/um/include')
0 files changed, 0 insertions, 0 deletions