From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 May 2015 22:49:29 +0000 (-0700)
Subject: Merge tag 'for-v4.1-rc' of git://git.infradead.org/battery-2.6
X-Git-Tag: android-x86-6.0-r1~1422
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cc49e8c9e66d4c52b121de0da666393c4140c0f2;p=android-x86%2Fkernel.git

Merge tag 'for-v4.1-rc' of git://git.infradead.org/battery-2.6

Pull power supply and reset fixes from Sebastian Reichel:
 "misc fixes"

* tag 'for-v4.1-rc' of git://git.infradead.org/battery-2.6:
  power: bq27x00_battery: Add missing MODULE_ALIAS
  power: reset: Add MFD_SYSCON depends for brcmstb
  power: reset: ltc2952: Remove bogus hrtimer_start() return value checks
  power_supply: fix oops in collie_battery driver
  power/reset: at91: fix return value check in at91_reset_platform_probe()
  MAINTAINERS: Add me as maintainer of Nokia N900 power supply drivers
  axp288_fuel_gauge: Add original author details
---

cc49e8c9e66d4c52b121de0da666393c4140c0f2