diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-25 18:42:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-25 18:42:08 -0800 |
| commit | 1ebe3839e66ae85e065157ba9d6f7923ad8d8fbf (patch) | |
| tree | 8ed65e1922a16eda1c7ae800da46ac2758774472 /kernel/memremap.c | |
| parent | 6dc390ad61ac8dfca5fa9b0823981fb6f7ec17a0 (diff) | |
| parent | 9aafabc7fece13c8e2a1f680908c73ee19f0f79b (diff) | |
Merge tag 'for-v4.5-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
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
Diffstat (limited to 'kernel/memremap.c')
0 files changed, 0 insertions, 0 deletions