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
Showing
- arch/x86/include/asm/uv/uv_bau.h 57 additions, 25 deletionsarch/x86/include/asm/uv/uv_bau.h
- arch/x86/platform/intel-mid/device_libs/Makefile 2 additions, 1 deletionarch/x86/platform/intel-mid/device_libs/Makefile
- arch/x86/platform/intel-mid/device_libs/platform_bt.c 108 additions, 0 deletionsarch/x86/platform/intel-mid/device_libs/platform_bt.c
- arch/x86/platform/uv/tlb_uv.c 132 additions, 63 deletionsarch/x86/platform/uv/tlb_uv.c
Please register or sign in to comment