WSL2-Linux-Kernel/drivers/power
Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
2011-11-06 19:44:47 -08:00
..
Kconfig um: switch to use of drivers/Kconfig 2011-11-02 14:15:41 +01:00
Makefile Merge git://git.infradead.org/battery-2.6 2011-07-31 06:24:50 -10:00
apm_power.c apm_power: Fix style error in macros 2011-07-08 16:55:56 +04:00
bq20z75.c bq20z75: Enable detection after registering 2011-07-08 16:53:07 +04:00
bq27x00_battery.c bq27x00_battery: Name of cycle count property 2011-05-20 19:25:05 +04:00
collie_battery.c power_supply: Don't use flush_scheduled_work() 2010-12-22 02:39:56 +03:00
da9030_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
ds2760_battery.c ds2760_battery: Fix rated capacity of the hx4700 1800mAh battery 2011-05-20 19:25:10 +04:00
ds2780_battery.c drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal 2011-11-02 16:07:03 -07:00
ds2782_battery.c Change Ryan Mallon's email address across the kernel 2011-06-16 11:22:05 +02:00
gpio-charger.c gpio-charger: Fix checking return value of request_any_context_irq 2011-07-08 17:01:59 +04:00
intel_mid_battery.c treewide: remove extra semicolons 2011-04-10 17:01:05 +02:00
isp1704_charger.c isp1704_charger: Allow board specific powering routine 2011-04-20 17:48:49 +04:00
jz4740-battery.c jz4740: silence warnings related to mfd_get_cell changes 2011-03-23 10:42:02 +01:00
max8903_charger.c drivers/power: Add module.h to the actual modules in drivers/power 2011-10-31 19:31:56 -04:00
max8925_power.c power_supply: Use max8925 platform_data from cell 2011-05-26 19:45:32 +02:00
max8997_charger.c drivers/power: Add module.h to the actual modules in drivers/power 2011-10-31 19:31:56 -04:00
max8998_charger.c drivers/power: Add module.h to the actual modules in drivers/power 2011-10-31 19:31:56 -04:00
max17040_battery.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
max17042_battery.c drivers/power: Add module.h to the actual modules in drivers/power 2011-10-31 19:31:56 -04:00
olpc_battery.c olpc_battery: Fix up XO-1.5 properties list 2011-01-13 01:41:57 +03:00
pcf50633-charger.c pcf50633-charger: Add missing sysfs_remove_group() 2010-09-22 16:14:49 +04:00
pda_power.c pda_power: Add function callbacks for suspend and resume 2010-04-16 19:14:34 +04: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.h power_supply: Use attribute groups 2010-05-19 12:14:28 +04:00
power_supply_core.c power_supply: Initialize changed_work before calling device_add 2011-02-22 11:01:42 +01:00
power_supply_leds.c power_supply: Add new LED trigger charging-blink-solid-full 2011-01-31 16:31:51 +03:00
power_supply_sysfs.c drivers: power_supply_sysfs.c needs stat.h 2011-10-31 19:31:15 -04:00
s3c_adc_battery.c s3c-adc-battery: Fix compilation error due to missing header (module.h) 2011-08-19 21:01:46 +04:00
test_power.c power: Make test_power driver more dynamic. 2011-05-20 19:25:08 +04:00
tosa_battery.c power_supply: Don't use flush_scheduled_work() 2010-12-22 02:39:56 +03:00
twl4030_charger.c twl4030_charger: Fix warnings 2011-07-08 16:57:59 +04:00
wm97xx_battery.c power_supply: Don't use flush_scheduled_work() 2010-12-22 02:39:56 +03:00
wm831x_backup.c wm831x_backup: Support multiple instances 2011-07-08 16:56:47 +04:00
wm831x_power.c wm831x_power: Support multiple instances 2011-07-08 16:57:21 +04:00
wm8350_power.c mfd: Update WM8350 drivers for changed interrupt numbers 2010-03-07 22:16:58 +01:00
z2_battery.c PXA: Use dev_pm_ops in z2_battery 2011-05-20 19:25:11 +04:00