Merge tag 'for-v4.5-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Feb 2016 02:42:08 +0000 (18:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Feb 2016 02:42:08 +0000 (18:42 -0800)
Pull power supply fixes from Sebastian Reichel:
 "Add a regression fix for changed sysfs path of bq27xxx_battery and
  update MAINTAINERS file"

* tag 'for-v4.5-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  power: bq27xxx_battery: Restore device name
  MAINTAINERS: update bq27xxx driver

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge