Len Brown 29b19e2504 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal ...

Conflicts:
	drivers/staging/omap-thermal/omap-thermal-common.
		OMAP supplied dummy TC1 and TC2,
		at the same time that the thermal tree removed them
		from thermal_zone_device_register()

	drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
		propogate the upstream MAX_IDR_LEVEL re-name
			to prevent a build failure

	Previously-fixed-by: Stephen Rothwell <sfr@canb.auug.org.au>

Signed-off-by: Len Brown <len.brown@intel.com>

2012-10-09 01:35:52 -04:00

..

avs

ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ

2012-09-12 18:06:30 -07:00

ab8500_btemp.c

workqueue: make deferrable delayed_work initializer names consistent

2012-08-21 13:18:23 -07:00

ab8500_charger.c

workqueue: make deferrable delayed_work initializer names consistent

2012-08-21 13:18:23 -07:00

ab8500_fg.c

workqueue: make deferrable delayed_work initializer names consistent

2012-08-21 13:18:23 -07:00

abx500_chargalg.c

workqueue: make deferrable delayed_work initializer names consistent

2012-08-21 13:18:23 -07:00

apm_power.c

device.h: cleanup users outside of linux/include (C files)

2012-03-11 14:27:37 -04:00

bq27x00_battery.c

bq27x00_battery: Add support for BQ27425 chip

2012-07-13 20:26:20 -07:00

charger-manager.c

workqueue: use mod_delayed_work() instead of cancel + queue

2012-08-13 16:27:37 -07:00

collie_battery.c

workqueue: deprecate flush[_delayed]_work_sync()

2012-08-20 14:51:24 -07:00

da9030_battery.c

power_supply: Convert drivers/power/* to use module_platform_driver()

2012-01-04 09:12:07 +04:00

da9052-battery.c

da9052-battery: Convert to use module_platform_driver

2012-03-26 20:41:17 +04:00

ds2760_battery.c

workqueue: use mod_delayed_work() instead of cancel + queue

2012-08-13 16:27:37 -07:00

ds2780_battery.c

W1: split master mutex to avoid deadlocks.

2012-06-13 16:38:40 -07:00

ds2781_battery.c

The tag contains just a few battery-related changes for v3.6. It's is

2012-07-31 18:08:25 -07:00

ds2782_battery.c

power_supply: Convert i2c drivers to module_i2c_driver

2012-03-26 20:41:22 +04:00

generic-adc-battery.c

power: battery: Generic battery driver using IIO

2012-09-22 10:40:23 +01:00

gpio-charger.c

gpio-charger: Use cansleep version of gpio_set_value

2012-06-19 20:48:37 -07:00

intel_mid_battery.c

power_supply: Convert drivers/power/* to use module_platform_driver()

2012-01-04 09:12:07 +04:00

isp1704_charger.c

usb: phy: fix return value check of usb_get_phy

2012-07-02 10:40:49 +03:00

jz4740-battery.c

workqueue: use mod_delayed_work() instead of cancel + queue

2012-08-13 16:27:37 -07:00

Kconfig

power: battery: Generic battery driver using IIO

2012-09-22 10:40:23 +01:00

lp8727_charger.c

lp8727_charger: Move header file into platform_data directory

2012-07-14 01:14:35 -07:00

Makefile

power: battery: Generic battery driver using IIO

2012-09-22 10:40:23 +01:00

max8903_charger.c

power_supply: Convert drivers/power/* to use module_platform_driver()

2012-01-04 09:12:07 +04:00

max8925_power.c

power_supply: Convert drivers/power/* to use module_platform_driver()

2012-01-04 09:12:07 +04:00

max8997_charger.c

max8997_charger: Remove duplicate module.h

2012-01-06 04:59:25 +04:00

max8998_charger.c

Revert "max8998_charger: Include linux/module.h just once"

2012-03-26 20:41:27 +04:00

max17040_battery.c

workqueue: make deferrable delayed_work initializer names consistent

2012-08-21 13:18:23 -07:00

max17042_battery.c

max17042_battery: Support CHARGE_COUNTER power supply attribute

2012-06-19 16:48:08 -07:00

olpc_battery.c

Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc

2012-08-02 11:52:39 -07:00

pcf50633-charger.c

power_supply: Convert drivers/power/* to use module_platform_driver()

2012-01-04 09:12:07 +04:00

pda_power.c

This patch series contains a major revamp of how we collect entropy

2012-07-31 19:07:42 -07:00

pmu_battery.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

power_supply_core.c

Thermal: Remove tc1/tc2 in generic thermal layer.

2012-09-24 14:44:36 +08:00

power_supply_leds.c

device.h: cleanup users outside of linux/include (C files)

2012-03-11 14:27:37 -04:00

power_supply_sysfs.c

power_supply: Add min/max alert properties for CAPACITY, TEMP, TEMP_AMBIENT

2012-07-13 20:41:58 -07:00

power_supply.h

device.h: cleanup users outside of linux/include (C files)

2012-03-11 14:27:37 -04:00

s3c_adc_battery.c

s3c_adc_battery: Average over more than one adc sample

2012-01-06 06:13:35 +04:00

sbs-battery.c

sbs-battery: Don't trigger false supply_changed event

2012-06-19 19:26:40 -07:00

smb347-charger.c

smb347-charger: Add constant charge and current properties

2012-06-19 16:47:37 -07:00

test_power.c

test_power: Add VOLTAGE_NOW and BATTERY_TEMP properties

2012-06-20 22:45:41 -07:00

tosa_battery.c

workqueue: deprecate flush[_delayed]_work_sync()

2012-08-20 14:51:24 -07:00

twl4030_charger.c

The tag contains just a few battery-related changes for v3.6. It's is

2012-07-31 18:08:25 -07:00

wm97xx_battery.c

workqueue: deprecate flush[_delayed]_work_sync()

2012-08-20 14:51:24 -07:00

wm831x_backup.c

power_supply: Convert drivers/power/* to use module_platform_driver()

2012-01-04 09:12:07 +04:00

wm831x_power.c

mfd: Convert wm831x to irq_domain

2012-05-20 17:27:07 +02:00

wm8350_power.c

power_supply: Convert drivers/power/* to use module_platform_driver()

2012-01-04 09:12:07 +04:00

z2_battery.c

workqueue: deprecate flush[_delayed]_work_sync()

2012-08-20 14:51:24 -07:00