Merge git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jan 2012 02:53:05 +0000 (18:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jan 2012 02:53:05 +0000 (18:53 -0800)
commitb24ca57e7625bc304e77bc429693ad32a691eb16
tree770aa389c6e763cf37776a35e85ff1e41958b1e9
parent6296e5d3c067df41980a5fd09ad4cc6765f79bb9
parent913272b3864d6da89c70d9fc2c30ccb57794b369
Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6: (68 commits)
  power_supply: Mark da9052 driver as broken
  power_supply: Drop usage of nowarn variant of sysfs_create_link()
  s3c_adc_battery: Average over more than one adc sample
  power_supply: Add DA9052 battery driver
  isp1704_charger: Fix missing check
  jz4740-battery: Fix signedness bug
  power_supply: Assume mains power by default
  sbs-battery: Fix devicetree match table
  ARM: rx51: Add bq27200 i2c board info
  sbs-battery: Change power supply name
  devicetree-bindings: Propagate bq20z75->sbs rename to dt bindings
  devicetree-bindings: Add vendor entry for Smart Battery Systems
  sbs-battery: Rename internals to new name
  bq20z75: Rename to sbs-battery
  wm97xx_battery: Use DEFINE_MUTEX() for work_lock
  max8997_charger: Remove duplicate module.h
  lp8727_charger: Some minor fixes for the header
  lp8727_charger: Add header file
  power_supply: Convert drivers/power/* to use module_platform_driver()
  power_supply: Add "unknown" in power supply type
  ...
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/mach-omap2/board-rx51-peripherals.c
drivers/hid/hid-wacom.c
drivers/hid/hid-wiimote-core.c
drivers/power/power_supply_sysfs.c