Merge branches 'acpi-resources', 'acpi-battery', 'acpi-doc' and 'acpi-pnp'
* acpi-resources: x86/PCI/ACPI: Make all resources except [io 0xcf8-0xcff] available on PCI bus * acpi-battery: ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook * acpi-doc: ACPI / documentation: Fix ambiguity in the GPIO properties document ACPI / documentation: fix a sentence about GPIO resources * acpi-pnp: ACPI / PNP: add two IDs to list for PNPACPI device enumeration
Showing
- Documentation/acpi/enumeration.txt 1 addition, 1 deletionDocumentation/acpi/enumeration.txt
- Documentation/acpi/gpio-properties.txt 3 additions, 3 deletionsDocumentation/acpi/gpio-properties.txt
- Documentation/kernel-parameters.txt 2 additions, 0 deletionsDocumentation/kernel-parameters.txt
- Documentation/module-signing.txt 3 additions, 3 deletionsDocumentation/module-signing.txt
- Documentation/networking/mpls-sysctl.txt 9 additions, 0 deletionsDocumentation/networking/mpls-sysctl.txt
- Documentation/networking/scaling.txt 1 addition, 1 deletionDocumentation/networking/scaling.txt
- Documentation/powerpc/transactional_memory.txt 16 additions, 16 deletionsDocumentation/powerpc/transactional_memory.txt
- MAINTAINERS 7 additions, 1 deletionMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm64/Kconfig 1 addition, 0 deletionsarch/arm64/Kconfig
- arch/arm64/include/asm/barrier.h 16 additions, 0 deletionsarch/arm64/include/asm/barrier.h
- arch/arm64/kernel/perf_event.c 7 additions, 2 deletionsarch/arm64/kernel/perf_event.c
- arch/arm64/mm/dma-mapping.c 4 additions, 5 deletionsarch/arm64/mm/dma-mapping.c
- arch/powerpc/include/uapi/asm/tm.h 1 addition, 1 deletionarch/powerpc/include/uapi/asm/tm.h
- arch/powerpc/kernel/eeh.c 10 additions, 1 deletionarch/powerpc/kernel/eeh.c
- arch/powerpc/kernel/entry_64.S 0 additions, 19 deletionsarch/powerpc/kernel/entry_64.S
- arch/powerpc/kernel/idle_power7.S 2 additions, 0 deletionsarch/powerpc/kernel/idle_power7.S
- arch/powerpc/kvm/book3s_xics.c 1 addition, 1 deletionarch/powerpc/kvm/book3s_xics.c
- arch/powerpc/platforms/powernv/pci-ioda.c 1 addition, 1 deletionarch/powerpc/platforms/powernv/pci-ioda.c
- arch/powerpc/platforms/pseries/dlpar.c 4 additions, 6 deletionsarch/powerpc/platforms/pseries/dlpar.c
Please register or sign in to comment