2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
linux-next/drivers/power
Linus Torvalds 092f4c56c1 Merge branch 'akpm' (Andrew's incoming - part two)
Says Andrew:

 "60 patches.  That's good enough for -rc1 I guess.  I have quite a lot
  of detritus to be rechecked, work through maintainers, etc.

 - most of the remains of MM
 - rtc
 - various misc
 - cgroups
 - memcg
 - cpusets
 - procfs
 - ipc
 - rapidio
 - sysctl
 - pps
 - w1
 - drivers/misc
 - aio"

* akpm: (60 commits)
  memcg: replace ss->id_lock with a rwlock
  aio: allocate kiocbs in batches
  drivers/misc/vmw_balloon.c: fix typo in code comment
  drivers/misc/vmw_balloon.c: determine page allocation flag can_sleep outside loop
  w1: disable irqs in critical section
  drivers/w1/w1_int.c: multiple masters used same init_name
  drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal
  drivers/power/ds2780_battery.c: add a nolock function to w1 interface
  drivers/power/ds2780_battery.c: create central point for calling w1 interface
  w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it
  pps gpio client: add missing dependency
  pps: new client driver using GPIO
  pps: default echo function
  include/linux/dma-mapping.h: add dma_zalloc_coherent()
  sysctl: make CONFIG_SYSCTL_SYSCALL default to n
  sysctl: add support for poll()
  RapidIO: documentation update
  drivers/net/rionet.c: fix ethernet address macros for LE platforms
  RapidIO: fix potential null deref in rio_setup_device()
  RapidIO: add mport driver for Tsi721 bridge
  ...
2011-11-02 16:07:27 -07: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
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
max8903_charger.c max8903_charger: Allow platform data to be __initdata 2011-07-08 17:01:57 +04:00
max8925_power.c power_supply: Use max8925 platform_data from cell 2011-05-26 19:45:32 +02:00
max8997_charger.c max8997_charger: Needs module.h 2011-08-19 21:01:41 +04:00
max8998_charger.c max8998_charger: Needs module.h 2011-08-19 20:56:58 +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 power_supply: MAX17042: Support additional properties 2011-07-08 17:01:58 +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_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 power_supply: Ignore -ENODATA errors when generating uevents 2011-02-22 06:47:52 +01:00
power_supply.h power_supply: Use attribute groups 2010-05-19 12:14:28 +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