path: root/include/net/af_vsock.h
diff options
authorDavid S. Miller <davem@davemloft.net>2014-05-05 13:06:01 -0400
committerDavid S. Miller <davem@davemloft.net>2014-05-05 13:06:01 -0400
commitb8dff4e60cbbb8a3382a265797ef8554a6868f39 (patch)
tree6239475199d604a510beeac76b09f095dd4849e0 /include/net/af_vsock.h
parentf6a082fed1e6407c2f4437d0d963b1bcbe5f9f58 (diff)
parent812e4dafa42c18bb5d2f810dc1dcf57284a15717 (diff)
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says: ==================== pull request: wireless 2014-05-01 Please pull the following batch of fixes intended for the 3.15 stream! For the Bluetooth bits, Gustavo says: "Some fixes for 3.15. There is a revert for the intel driver, a new device id, and two important SSP fixes from Johan." On top of that... Ben Hutchings gives us a fix for an unbalanced irq enable in an rtl8192cu error path. Colin Ian King provides an rtlwifi fix for an uninitialized variable. Felix Fietkau brings a pair of ath9k fixes, one that corrects a hardware initialization value and another that removes an (unnecessary) flag that was being used in a way that led to a software tx queue hang in ath9k. Gertjan van Wingerde pushes a MAINTAINERS change to remove himself from the rt2x00 maintainer team. Hans de Goede fixes a brcmfmac firmware load hang. Larry Finger changes rtlwifi to use the correct queue for V0 traffic on rtl8192se. Rajkumar Manoharan corrects a race in ath9k driver initialization. Stanislaw Gruszka fixes an rt2x00 bug in which disabling beaconing once on USB devices led to permanently disabling beaconing for those devices. Tim Harvey provides fixes for a pair of ath9k issues that can lead to soft lockups in that driver. Please let me know if there are problems! ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/af_vsock.h')
0 files changed, 0 insertions, 0 deletions