summaryrefslogtreecommitdiffstats
path: root/net/sched/em_canid.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-17 21:10:22 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-17 21:10:22 +0200
commit5ff132c07aa155d759ab3da946c86351313d3020 (patch)
treeeb8a6337128a1958e52182d76231ea8367adca7b /net/sched/em_canid.c
parentMerge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff)
parentpower_supply: tps65217-charger: fix missing platform_set_drvdata() (diff)
downloadlinux-5ff132c07aa155d759ab3da946c86351313d3020.tar.xz
linux-5ff132c07aa155d759ab3da946c86351313d3020.zip
Merge tag 'for-v4.8-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply fixes from Sebastian Reichel. * tag 'for-v4.8-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: power_supply: tps65217-charger: fix missing platform_set_drvdata() power: reset: hisi-reboot: Unmap region obtained by of_iomap power: reset: reboot-mode: fix build error of missing ioremap/iounmap on UM power: supply: max17042_battery: fix model download bug.
Diffstat (limited to 'net/sched/em_canid.c')
0 files changed, 0 insertions, 0 deletions