path: root/sound/firewire/bebob/Makefile

ption>

Age	Commit message (Expand)	Author	Files	Lines
space:
mode:

author	Linus Torvalds <torvalds@linux-foundation.org>	2016-12-20 15:48:34 -0800
committer	Linus Torvalds <torvalds@linux-foundation.org>	2016-12-20 15:48:34 -0800
commit	ba6d973f78eb62ffebb32f6ef3334fc9a3b33d22 (patch)
tree	81b4e19de7308ce46ac7d0f670302906a906f0d0 /security/selinux/include/netlabel.h
parent	3eb86259eca6a363ed7bb13ecea5cda809f7b97d (diff)
parent	a763f78cea845c91b8d91f93dabf70c407635dc5 (diff)

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull networking fixes and cleanups from David Miller: 1) Use rb_entry() instead of hardcoded container_of(), from Geliang Tang. 2) Use correct memory barriers in stammac driver, from Pavel Machek. 3) Fix assoc bind address handling in SCTP, from Xin Long. 4) Make the length check for UFO handling consistent between __ip_append_data() and ip_finish_output(), from Zheng Li. 5) HSI driver compatible strings were busted fro hix5hd2, from Dongpo Li. 6) Handle devm_ioremap() errors properly in cavium driver, from Arvind Yadav. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (22 commits) RDS: use rb_entry() net_sched: sch_netem: use rb_entry() net_sched: sch_fq: use rb_entry() net/mlx5: use rb_entry() ethernet: sfc: Add Kconfig entry for vendor Solarflare sctp: not copying duplicate addrs to the assoc's bind address list sctp: reduce indent level in sctp_copy_local_addr_list ARM: dts: hix5hd2: don't change the existing compatible string net: hix5hd2_gmac: fix compatible strings name openvswitch: Add a missing break statement. net: netcp: ethss: fix 10gbe host port tx pri map configuration net: netcp: ethss: fix errors in ethtool ops fsl/fman: enable compilation on ARM64 fsl/fman: A007273 only applies to PPC SoCs powerpc: fsl/fman: remove fsl,fman from of_device_ids[] fsl/fman: fix 1G support for QSGMII interfaces dt: bindings: net: use boolean dt properties for eee broken modes net: phy: use boolean dt properties for eee broken modes net: phy: fix sign type error in genphy_config_eee_advert ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output ...

Diffstat (limited to 'security/selinux/include/netlabel.h')