aboutsummaryrefslogtreecommitdiff
path: root/include/linux/power_supply.h
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-07-06 10:31:20 -0700
committerKevin Hilman <khilman@linaro.org>2015-07-06 10:31:20 -0700
commit630835f74b883ccf1c4c674edd40ed050b6d30e3 (patch)
treed9b49580802a66b7aa29def81efd79c5a990c44c /include/linux/power_supply.h
parentb953c0d234bc72e8489d3bf51a276c5c4ec85345 (diff)
parent6a010c0abd49388a49af3d5a5bfc00e0d5767607 (diff)
Merge tag 'v4.1.1' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v4.1
This is the 4.1.1 stable release * tag 'v4.1.1' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: Linux 4.1.1 cdc-acm: Add support of ATOL FPrint fiscal printers b43: fix support for 14e4:4321 PCI dev with BCM4321 chipset ath3k: add support of 13d3:3474 AR3012 device ath3k: Add support of 0489:e076 AR3012 device Bluetooth: ath3k: Add support of 04ca:300d AR3012 device perf tools: Fix build breakage if prefix= is specified perf/x86: Honor the architectural performance monitoring version perf/x86/intel/bts: Fix DS area sharing with x86_pmu events perf/x86: Add more Broadwell model numbers perf: Fix ring_buffer_attach() RCU sync, again x86/boot: Fix overflow warning with 32-bit binutils
Diffstat (limited to 'include/linux/power_supply.h')
0 files changed, 0 insertions, 0 deletions