summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/l...Linus Torvalds2014-10-2431-422/+2222
|\
| * Merge branch 'int340x-thermal' of .git into nextZhang Rui2014-10-1722-408/+1867
| |\
| | * Thermal: int340x thermal: select ACPI fan driverZhang Rui2014-10-172-1/+2
| | * Thermal: int3400_thermal: use acpi_thermal_rel parsing APIsJacob Pan2014-10-111-159/+13
| | * Thermal: int340x_thermal: expose acpi thermal relationship tablesJacob Pan2014-10-114-0/+490
| | * Thermal: introduce int3403 thermal driverLan Tianyu2014-10-115-312/+478
| | * Thermal: introduce INT3402 thermal driverAaron Lu2014-10-103-0/+245
| | * Thermal: move the KELVIN_TO_MILLICELSIUS macro to thermal.hAaron Lu2014-10-102-9/+11
| | * ACPI / Fan: support INT3404 thermal deviceAaron Lu2014-10-101-0/+1
| | * ACPI / Fan: add ACPI 4.0 style fan supportAaron Lu2014-10-101-27/+241
| | * ACPI / fan: convert to platform driverAaron Lu2014-10-101-34/+28
| | * ACPI / fan: use acpi_device_xxx_power instead of acpi_bus equivelantAaron Lu2014-10-104-7/+7
| | * ACPI / fan: remove no need check for device pointerAaron Lu2014-10-101-17/+1
| | * ACPI / fan: remove unused macroAaron Lu2014-10-101-4/+0
| | * Thermal: int3400 thermal: register to thermal frameworkZhang Rui2014-10-102-0/+104
| | * Thermal: int3400 thermal: add capability to detect supporting UUIDsZhang Rui2014-10-101-0/+69
| | * Thermal: introduce int3400 thermal driverZhang Rui2014-10-105-2/+249
| | * ACPI: add ACPI_TYPE_LOCAL_REFERENCE support to acpi_extract_package()Zhang Rui2014-10-101-1/+27
| | * ACPI: make acpi_create_platform_device() an external APIZhang Rui2014-10-103-7/+2
| | * ACPI: introduce ACPI int340x thermal scan handlerZhang Rui2014-09-115-0/+71
| * | Merge branch 'thermal-core-fix' of .git into nextZhang Rui2014-10-111-1/+1
| |\ \
| | * | thermal: step_wise: fix: Prevent from binary overflow when trend is droppingLukasz Majewski2014-10-091-1/+1
| | |/
| * | Merge branches 'eduardo-soc' and 'bang-bang-governor' of .git into nextZhang Rui2014-09-185-0/+155
| |\ \
| | * | thermal: Added Bang-bang thermal governorPeter Feuerer2014-08-275-0/+155
| | |/
| * | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti...Zhang Rui2014-08-277-15/+200
| |\ \ | | |/ | |/|
| | * Thermal: imx: add i.mx6sx thermal supportAnson Huang2014-08-092-14/+82
| | * thermal: add support to disable thermal zone from DTSLaxman Dewangan2014-07-291-0/+12
| | * thermal: trace: Trace when temperature is above a trip pointPunit Agrawal2014-07-294-1/+44
| | * thermal: trace: Trace when a cooling device's state is updatedPunit Agrawal2014-07-292-0/+20
| | * thermal: trace: Trace temperature changesPunit Agrawal2014-07-292-0/+42
* | | Merge tag 'remove-weak-declarations' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2014-10-238-28/+21
|\ \ \
| * | | uprobes: Remove "weak" from function declarationsBjorn Helgaas2014-10-221-7/+7
| * | | memory-hotplug: Remove "weak" from memory_block_size_bytes() declarationBjorn Helgaas2014-10-221-1/+1
| * | | kgdb: Remove "weak" from kgdb_arch_pc() declarationBjorn Helgaas2014-10-221-1/+1
| * | | ARC: kgdb: generic kgdb_arch_pc() sufficesVineet Gupta2014-10-221-5/+0
| * | | vmcore: Remove "weak" from function declarationsBjorn Helgaas2014-10-221-8/+7
| * | | clocksource: Remove "weak" from clocksource_default_clock() declarationBjorn Helgaas2014-10-221-1/+1
| * | | x86, intel-mid: Remove "weak" from function declarationsBjorn Helgaas2014-10-221-4/+3
| * | | audit: Remove "weak" from audit_classify_compat_syscall() declarationBjorn Helgaas2014-10-221-1/+1
* | | | Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2014-10-2320-123/+528
|\ \ \ \
| * \ \ \ Merge branch 'next' into efi-next-mergeMatt Fleming2014-10-0320-123/+528
| |\ \ \ \
| | * | | | rtc: Disable EFI rtc for x86Matt Fleming2014-10-031-1/+1
| | * | | | efi: rtc-efi: Export platform:rtc-efi as module aliasArd Biesheuvel2014-10-031-0/+1
| | * | | | efi: Delete the in_nmi() conditional runtime lockingMatt Fleming2014-10-032-15/+4
| | * | | | efi: Provide a non-blocking SetVariable() operationMatt Fleming2014-10-033-0/+72
| | * | | | x86/efi: Adding efi_printks on memory allocationa and pci.readsAndre Müller2014-10-031-7/+21
| | * | | | x86/efi: Mark initialization code as suchMathias Krause2014-10-035-22/+24
| | * | | | x86/efi: Update comment regarding required phys mapped EFI servicesMathias Krause2014-10-031-6/+6
| | * | | | x86/efi: Unexport add_efi_memmap variableMathias Krause2014-10-032-4/+1
| | * | | | x86/efi: Remove unused efi_call* macrosMathias Krause2014-10-031-10/+0
OpenPOWER on IntegriCloud