2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 09:43:59 +08:00
linux-next/drivers/power
Linus Torvalds 06991c28f3 Driver core patches for 3.9-rc1
Here is the big driver core merge for 3.9-rc1
 
 There are two major series here, both of which touch lots of drivers all
 over the kernel, and will cause you some merge conflicts:
   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.
   - remove CONFIG_EXPERIMENTAL
 
 If you need me to provide a merged tree to handle these resolutions,
 please let me know.
 
 Other than those patches, there's not much here, some minor fixes and
 updates.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iEYEABECAAYFAlEmV0cACgkQMUfUDdst+yncCQCfbmnQZju7kzWXk6PjdFuKspT9
 weAAoMCzcAtEzzc4LXuUxxG/sXBVBCjW
 =yWAQ
 -----END PGP SIGNATURE-----

Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core patches from Greg Kroah-Hartman:
 "Here is the big driver core merge for 3.9-rc1

  There are two major series here, both of which touch lots of drivers
  all over the kernel, and will cause you some merge conflicts:

   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.

   - remove CONFIG_EXPERIMENTAL

  Other than those patches, there's not much here, some minor fixes and
  updates"

Fix up trivial conflicts

* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
  base: memory: fix soft/hard_offline_page permissions
  drivercore: Fix ordering between deferred_probe and exiting initcalls
  backlight: fix class_find_device() arguments
  TTY: mark tty_get_device call with the proper const values
  driver-core: constify data for class_find_device()
  firmware: Ignore abort check when no user-helper is used
  firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
  firmware: Make user-mode helper optional
  firmware: Refactoring for splitting user-mode helper code
  Driver core: treat unregistered bus_types as having no devices
  watchdog: Convert to devm_ioremap_resource()
  thermal: Convert to devm_ioremap_resource()
  spi: Convert to devm_ioremap_resource()
  power: Convert to devm_ioremap_resource()
  mtd: Convert to devm_ioremap_resource()
  mmc: Convert to devm_ioremap_resource()
  mfd: Convert to devm_ioremap_resource()
  media: Convert to devm_ioremap_resource()
  iommu: Convert to devm_ioremap_resource()
  drm: Convert to devm_ioremap_resource()
  ...
2013-02-21 12:05:51 -08:00
..
avs ARM: OMAP2+: Drop plat/cpu.h for omap2plus 2012-12-17 10:50:41 -08:00
reset - Four new drivers: 2013-02-20 10:19:07 -08:00
88pm860x_battery.c 88pm860x_battery: Eliminate possible references to released resources 2013-01-06 12:46:23 -08:00
88pm860x_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
ab8500_bmdata.c - Four new drivers: 2013-02-20 10:19:07 -08:00
ab8500_btemp.c Merge branch 'tb-power-2' of git://git.linaro.org/people/ljones/linux-3.0-ux500 2013-02-02 19:29:13 -08:00
ab8500_charger.c u8500-charger: Delay for USB enumeration 2013-01-23 14:39:22 +00:00
ab8500_fg.c ab8500-fg: Use correct battery charge full design 2013-01-23 14:39:20 +00:00
abx500_chargalg.c abx500-chargalg: Add new sysfs interface to get current charge status 2013-01-23 14:39:16 +00: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: Fix reporting battery temperature 2013-02-02 19:44:08 -08:00
bq2415x_charger.c bq2415x_charger: Add support for offline and 100mA mode 2013-02-16 13:34:10 -08:00
charger-manager.c charger_manager: Don't use [delayed_]work_pending() 2013-01-05 14:03:26 -08:00
collie_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
da9030_battery.c da9030_battery: Include notifier.h 2013-02-08 17:28:35 -08:00
da9052-battery.c da9052-battery: Avoid out-of-range array access 2013-01-06 14:34:26 -08:00
ds2760_battery.c workqueue: use mod_delayed_work() instead of cancel + queue 2012-08-13 16:27:37 -07:00
ds2780_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
ds2781_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
ds2782_battery.c ds2782_battery: Add power_supply_changed() calls for proper uevent support 2013-02-02 19:07:34 -08:00
generic-adc-battery.c generic-adc-battery: Fix forever loop in gab_remove() 2013-02-16 13:27:09 -08:00
goldfish_battery.c power: Add battery driver for goldfish emulator 2013-02-02 19:06:34 -08:00
gpio-charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
intel_mid_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
isp1704_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
jz4740-battery.c power: Convert to devm_ioremap_resource() 2013-01-25 12:21:47 -08:00
Kconfig goldfish_battery: Add missing GENERIC_HARDIRQS dependency 2013-02-16 13:23:33 -08:00
lp8727_charger.c lp8727_charger: Small cleanup in naming 2013-02-02 19:33:52 -08:00
lp8788-charger.c lp8788-charger: Fix a parent device in kernel messages 2013-01-06 14:18:43 -08:00
Makefile Merge branch 'tb-power-2' of git://git.linaro.org/people/ljones/linux-3.0-ux500 2013-02-02 19:29:13 -08:00
max8903_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
max8925_power.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
max8997_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
max8998_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
max17040_battery.c max17040_battery: Use devm_kzalloc 2013-01-06 14:18:58 -08:00
max17042_battery.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
olpc_battery.c Drivers: power: remove __dev* attributes. 2013-01-03 15:57:14 -08:00
pcf50633-charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
pda_power.c pda_power: Remove ac_draw_failed goto and label 2012-09-21 16:50:11 -07:00
pm2301_charger.c pm2301: LPN mode control support 2013-01-23 14:39:19 +00:00
pm2301_charger.h pm2301: LPN mode control support 2013-01-23 14:39:19 +00: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 driver-core: constify data for class_find_device() 2013-02-06 12:18:56 -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 watchdog and safety timer expiries under PROP_HEALTH_* 2013-01-05 18:51:18 -08:00
power_supply.h device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
rx51_battery.c Drivers: power: remove __dev* attributes. 2013-01-03 15:57:14 -08:00
s3c_adc_battery.c power: remove use of __devinit 2012-11-28 11:43:22 -08:00
sbs-battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
smb347-charger.c power: remove use of __devexit_p 2012-11-28 11:43:22 -08:00
test_power.c test_power: Add VOLTAGE_NOW and BATTERY_TEMP properties 2012-06-20 22:45:41 -07:00
tosa_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
twl4030_charger.c twl4030_charger: Change TWL4030_MODULE_* ids to TWL_MODULE_* 2012-11-18 16:14:52 -08:00
wm97xx_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
wm831x_backup.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
wm831x_power.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
wm8350_power.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
z2_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00