aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/xfrm4_output.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-10-24 05:13:16 -0700
committerDavid S. Miller <davem@davemloft.net>2015-10-24 05:13:16 -0700
commita72c9512bf2bef12c5e66a4d910c4b348fe31d61 (patch)
treecfce1711f9a5fc1ef0774e9f2e31945600ff15e0 /net/ipv4/xfrm4_output.c
parentbnxt_en: Fix compile errors when CONFIG_BNXT_SRIOV is not set. (diff)
parentBluetooth: Increase minor version of core module (diff)
downloadlinux-dev-a72c9512bf2bef12c5e66a4d910c4b348fe31d61.tar.xz
linux-dev-a72c9512bf2bef12c5e66a4d910c4b348fe31d61.zip
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says: ==================== pull request: bluetooth-next 2015-10-22 Here's probably the last bluetooth-next pull request for 4.4. Among several other changes it contains the rest of the fixes & cleanups from the Bluetooth UnplugFest (that didn't need to be hurried to 4.3). - Refactoring & cleanups to 6lowpan code - New USB ids for two Atheros controllers and BCM43142A0 from Broadcom - Fix (quirk) for broken Broadcom BCM2045 controllers - Support for latest Apple controllers - Improvements to the vendor diagnostic message support Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_output.c')
0 files changed, 0 insertions, 0 deletions