summaryrefslogtreecommitdiffstats
path: root/net/xfrm/xfrm_policy.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-27 23:11:14 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-27 23:11:14 -0700
commit16eb2bfc65ef86d3ac6420d50ddc2c48f0023cee (patch)
tree50f0163f007a90b0c8fcb2e5651cfbb5d6ed0596 /net/xfrm/xfrm_policy.c
parent7b9d1f0b7a18b86db0ac1de628fa91c0994fefbe (diff)
parentd3b503140e15d302bc55cf5a90226f0f85860bc2 (diff)
downloadop-kernel-dev-16eb2bfc65ef86d3ac6420d50ddc2c48f0023cee.zip
op-kernel-dev-16eb2bfc65ef86d3ac6420d50ddc2c48f0023cee.tar.gz
Merge tag 'extcon-next-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next
Chanwoo writes: Update extcon for v3.17 This patchset add new extcon provider driver and fix minor issue of extcon driver. Detailed description for patchset: 1. Add new Silicon-Mitus SM5502 MUIC (Micro-USB Interface Controller) device - extcon-sm5502 driver is capable of identifying the type of the external power source and attached accessory. And external power sources, such as Dedicated charger or a standard USB port, are able to charge the battery in the smart phone via the connector. 2. Fix minor issue of extcon driver - extcon-arizona driver - extcon-palmas driver - Remove unnecessary OOM messages for all extcon device drivers 3. Fix minor issue of extcon core - Re-order the sequence of extcon device driver in Kconfig/Makefile alphabitically - Set parent device of extcon device automatically using devm_extcon_dev_allocate() 4. Fix MAX77693 driver - This patchset has dependency on MFD/Regulator/Extcon. So, Lee Jones (MFD Maintainer) created Immutable branch between MFD and Extcon due for v3.17 merge-window and then I merged this patchset from MFD git repo[1] to Extcon git repo. [1] git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd (branch: ib-mfd-extcon-regulator)
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud