diff options
| author | Linus Torvalds <[email protected]> | 2015-09-17 19:25:42 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2015-09-17 19:25:42 +0000 |
| commit | 2e5735f4c377377cb738270024083f74ee058877 (patch) | |
| tree | cd74432ce5b30dd724423108248f08b95bff4207 /net/switchdev/switchdev.c | |
| parent | Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm6... (diff) | |
| parent | twl4030_charger: fix another compile error (diff) | |
| download | kernel-2e5735f4c377377cb738270024083f74ee058877.tar.gz kernel-2e5735f4c377377cb738270024083f74ee058877.zip | |
Merge tag 'for-v4.3-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply fixes from Sebastian Reichel:
"twl4030-charger fixes"
* tag 'for-v4.3-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
twl4030_charger: fix another compile error
Revert "twl4030_charger: correctly handle -EPROBE_DEFER from devm_usb_get_phy_by_node"
Diffstat (limited to 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions