Jiri Kosina e75d660672 Merge branch 'master' into for-next ...

Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.

Conflicts:
	drivers/net/ethernet/realtek/r8169.c

2012-04-08 21:48:52 +02:00

..

ab8500_btemp.c

ab8500_btemp: Get rid of 'enum adc_therm'

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

ab8500_charger.c

ab8500: Turn unneeded global symbols into local ones

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

ab8500_fg.c

ab8500_fg: Fix some build warnings on x86_64

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

abx500_chargalg.c

ab8500: Turn unneeded global symbols into local ones

2012-03-26 20:41:14 +04: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

Merge branch 'master' into for-next

2012-04-08 21:48:52 +02:00

charger-manager.c

charger-manager: Simplify charger_get_property(), get rid of a warning

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

collie_battery.c

…

da9030_battery.c

…

da9052-battery.c

da9052-battery: Convert to use module_platform_driver

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

ds2760_battery.c

…

ds2780_battery.c

…

ds2781_battery.c

DS2781 Maxim Stand-Alone Fuel Gauge battery and w1 slave drivers

2012-03-08 11:15:33 -08:00

ds2782_battery.c

power_supply: Convert i2c drivers to module_i2c_driver

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

gpio-charger.c

…

intel_mid_battery.c

…

isp1704_charger.c

Merge tag 'for-v3.4-rc1' of git://git.infradead.org/battery-2.6

2012-03-30 16:09:02 -07:00

jz4740-battery.c

…

Kconfig

Merge tag 'for-v3.4-rc1' of git://git.infradead.org/battery-2.6

2012-03-30 16:09:02 -07:00

lp8727_charger.c

power_supply: Convert i2c drivers to module_i2c_driver

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

Makefile

Merge tag 'for-v3.4-rc1' of git://git.infradead.org/battery-2.6

2012-03-30 16:09:02 -07:00

max8903_charger.c

…

max8925_power.c

…

max8997_charger.c

…

max8998_charger.c

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

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

max17040_battery.c

power_supply: Convert i2c drivers to module_i2c_driver

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

max17042_battery.c

max17042_battery: Clean up interrupt handling

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

olpc_battery.c

…

pcf50633-charger.c

…

pda_power.c

power_supply: Convert all users to new usb_phy

2012-02-13 13:53:21 +02:00

pmu_battery.c

…

power_supply_core.c

…

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

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

2012-03-11 14:27:37 -04: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

…

sbs-battery.c

power_supply: Convert i2c drivers to module_i2c_driver

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

smb347-charger.c

Add I2C driver for Summit Microelectronics SMB347 Battery Charger.

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

test_power.c

…

tosa_battery.c

…

twl4030_charger.c

power_supply: Convert all users to new usb_phy

2012-02-13 13:53:21 +02:00

wm97xx_battery.c

…

wm831x_backup.c

…

wm831x_power.c

…

wm8350_power.c

…

z2_battery.c

power_supply: Convert i2c drivers to module_i2c_driver

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