Linus Torvalds fc6bdb59a5 Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc ... Pull OLPC platform updates from Andres Salomon: "These move the OLPC Embedded Controller driver out of arch/x86/platform and into drivers/platform/olpc. OLPC machines are now ARM-based (which means lots of x86 and ARM changes), but are typically pretty self-contained.. so it makes more sense to go through a separate OLPC tree after getting the appropriate review/ACKs." * 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc: x86: OLPC: move s/r-related EC cmds to EC driver Platform: OLPC: move global variables into priv struct Platform: OLPC: move debugfs support from x86 EC driver x86: OLPC: switch over to using new EC driver on x86 Platform: OLPC: add a suspended flag to the EC driver Platform: OLPC: turn EC driver into a platform_driver Platform: OLPC: allow EC cmd to be overridden, and create a workqueue to call it drivers: OLPC: update various drivers to include olpc-ec.h Platform: OLPC: add a stub to drivers/platform/ for the OLPC EC driver		2012-08-02 11:52:39 -07:00
..
avs	ARM: OMAP2+: do not allow SmartReflex to be built as a module	2012-06-29 05:54:31 -07:00
ab8500_btemp.c	ab8500: Clean up probe routines	2012-05-05 04:55:50 -07:00
ab8500_charger.c	usb: phy: fix return value check of usb_get_phy	2012-07-02 10:40:49 +03:00
ab8500_fg.c	ab8500: Clean up probe routines	2012-05-05 04:55:50 -07:00
abx500_chargalg.c
apm_power.c
bq27x00_battery.c	bq27x00_battery: Add support for BQ27425 chip	2012-07-13 20:26:20 -07:00
charger-manager.c	charger-manager: Set current limit of regulator for over current protection	2012-07-13 18:31:17 -07:00
collie_battery.c
da9030_battery.c
da9052-battery.c
ds2760_battery.c
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
gpio-charger.c	gpio-charger: Use cansleep version of gpio_set_value	2012-06-19 20:48:37 -07:00
intel_mid_battery.c
isp1704_charger.c	usb: phy: fix return value check of usb_get_phy	2012-07-02 10:40:49 +03:00
jz4740-battery.c
Kconfig	The tag contains just a few battery-related changes for v3.6. It's is	2012-07-31 18:08:25 -07:00
lp8727_charger.c	lp8727_charger: Move header file into platform_data directory	2012-07-14 01:14:35 -07:00
Makefile	ARM: OMAP: SmartReflex: Move smartreflex driver to drivers/	2012-05-31 16:36:30 -07:00
max8903_charger.c
max8925_power.c
max8997_charger.c
max8998_charger.c
max17040_battery.c
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
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
power_supply_core.c	Merge with upstream to accommodate with thermal changes	2012-07-31 05:16:47 -07:00
power_supply_leds.c
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
s3c_adc_battery.c
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
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
wm831x_backup.c
wm831x_power.c	mfd: Convert wm831x to irq_domain	2012-05-20 17:27:07 +02:00
wm8350_power.c
z2_battery.c