summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-05-2313-347/+902
|\
| * hwmon: (it87) Make temp3 attribute conditional for IT8782FGuenter Roeck2012-05-221-20/+61
| * hwmon: (it87) Convert to use devm_kzalloc and devm_request_regionGuenter Roeck2012-05-221-34/+20
| * hwmon: INA219 and INA226 supportFelten, Lothar2012-05-225-0/+430
| * hwmon: (it87) Create voltage attributes only if voltage is enabledGuenter Roeck2012-05-211-38/+124
| * hwmon: (ntc_thermistor) Fix checkpatch warningGuenter Roeck2012-05-211-6/+6
| * hwmon: (ntc_thermistor) Optimize and fix build warningGuenter Roeck2012-05-211-84/+80
| * hwmon: (ntc_thermistor) Return error code from hwmon_device_registerGuenter Roeck2012-05-211-2/+2
| * hwmon: (ntc_thermistor) Convert to devm_kzallocGuenter Roeck2012-05-211-8/+3
| * hwmon: (ad7314) Remove unused defines, and rename OFFSET to SHIFTGuenter Roeck2012-05-211-9/+2
| * acpi_power_meter: clean up code around setup_attrsKyle McMartin2012-05-211-8/+7
| * acpi_power_meter: drop meter_rw_attrs, use common meter_attrsKyle McMartin2012-05-211-9/+2
| * acpi_power_meter: remove duplicate code between register_{ro,rw}_attrsKyle McMartin2012-05-211-42/+17
| * acpi_power_meter: use a {RW,RO}_SENSOR_TEMPLATE macro to clean things upKyle McMartin2012-05-211-93/+37
| * acpi_power_meter: use the same struct {rw,ro}_sensor_template for bothKyle McMartin2012-05-211-43/+110
| * hwmon: use module_pci_driverAxel Lin2012-05-213-36/+3
| * hwmon: (it87) Add support for IT8782F and IT8783E/FGuenter Roeck2012-05-212-35/+118
* | Merge tag 'pm-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...Linus Torvalds2012-05-2330-320/+1359
|\ \
| * \ Merge branch 'pm-sleep'Rafael J. Wysocki2012-05-221-1/+1
| |\ \
| | * | epoll: Fix user space breakage related to EPOLLWAKEUPRafael J. Wysocki2012-05-221-1/+1
| * | | Merge branch 'pm-sleep'Rafael J. Wysocki2012-05-182-0/+15
| |\| |
| | * | PM / Hibernate: Use get_gendisk to verify partition if resume_file is integer...Minho Ban2012-05-182-0/+15
| * | | Merge branch 'pm-domains'Rafael J. Wysocki2012-05-182-6/+23
| |\ \ \
| | * | | PM / Domains: Make it possible to add devices to inactive domainsRafael J. Wysocki2012-05-182-6/+23
| * | | | Merge branch 'pm-sleep'Rafael J. Wysocki2012-05-1119-118/+1050
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | PM / Sleep: User space wakeup sources garbage collector Kconfig optionRafael J. Wysocki2012-05-112-39/+67
| | * | | PM / Sleep: Make the limit of user space wakeup sources configurableRafael J. Wysocki2012-05-112-5/+32
| | * | | PM / Documentation: suspend-and-cpuhotplug.txt: Fix typoMarcos Paulo de Souza2012-05-051-1/+1
| | * | | PM / Sleep: Fix a mistake in a conditional in autosleep_store()Arve Hjønnevåg2012-05-051-1/+1
| | * | | epoll: Add a flag, EPOLLWAKEUP, to prevent suspend while epoll events are readyArve Hjønnevåg2012-05-053-4/+103
| | * | | PM / Sleep: Add user space interface for manipulating wakeup sources, v3Rafael J. Wysocki2012-05-017-0/+317
| | * | | PM / Sleep: Add "prevent autosleep time" statistics to wakeup sourcesRafael J. Wysocki2012-05-016-5/+102
| | * | | PM / Sleep: Implement opportunistic sleep, v2Rafael J. Wysocki2012-05-018-35/+298
| | * | | PM / Sleep: Add wakeup_source_activate and wakeup_source_deactivate tracepointsArve Hjønnevåg2012-05-012-3/+43
| | * | | PM / Sleep: Change wakeup source statistics to follow AndroidRafael J. Wysocki2012-05-014-52/+77
| | * | | PM / Sleep: Use wait queue to signal "no wakeup events in progress"Rafael J. Wysocki2012-05-011-3/+13
| | * | | PM / Sleep: Look for wakeup events in later stages of device suspendRafael J. Wysocki2012-05-011-0/+10
| | * | | PM / Hibernate: Hibernate/thaw fixes/improvementsBojan Smojver2012-05-011-23/+39
| * | | | Merge branch 'pm-domains'Rafael J. Wysocki2012-05-117-197/+258
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | PM / Domains: Fix computation of maximum domain off timeRafael J. Wysocki2012-05-111-11/+12
| | * | | PM / Domains: Fix link checking when add subdomainHuang Ying2012-05-111-1/+1
| | * | | PM / Domains: Cache device stop and domain power off governor results, v3Rafael J. Wysocki2012-05-053-19/+153
| | * | | PM / Domains: Make device removal more straightforwardRafael J. Wysocki2012-05-051-16/+11
| | * | | PM / QoS: Create device constraints objects on notifier registrationRafael J. Wysocki2012-05-011-7/+12
| | * | | PM / Runtime: Remove device fields related to suspend time, v2Rafael J. Wysocki2012-05-014-119/+2
| | * | | PM / Domains: Rework default domain power off governor function, v2Rafael J. Wysocki2012-05-013-38/+35
| | * | | PM / Domains: Rework default device stop governor function, v2Rafael J. Wysocki2012-05-013-5/+51
| | |/ /
| * | | Merge branch 'pm-devfreq'Rafael J. Wysocki2012-05-112-0/+14
| |\ \ \
| | * | | PM: devfreq: init performance/powersave governorXiaoguang Chen2012-05-012-0/+14
| | |/ /
* | | | Merge tag 'regmap-domain-deps' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2012-05-232-3/+1
|\ \ \ \