path: root/net/core/dev.c
diff options
authorDavid S. Miller <davem@davemloft.net>2014-01-10 13:21:22 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-10 13:21:22 -0500
commitc4d7099867c7e7ade7693a5ac06f12b3c3cdbf8e (patch)
tree5d5fa21f642c0f4083f35f11ea04c9c86df96f85 /net/core/dev.c
parent95e92fd40c967c363ad66b2fd1ce4dcd68132e54 (diff)
parent0f74d82d80e653545f4190c96a25f3b6751a8370 (diff)
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says: ==================== For the mac80211 bits, Johannes says: "I have a fix from Javier for mac80211_hwsim when used with wmediumd userspace, and a fix from Felix for buffering in AP mode." For the NFC bits, Samuel says: "This pull request only contains one fix for a regression introduced with commit e29a9e2ae165620d. Without this fix, we can not establish a p2p link in target mode. Only initiator mode works." For the iwlwifi bits, Emmanuel says: "It only includes new device IDs so it's not vital. If you have a pull request to net.git anyway, I'd happy to have this in." ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
0 files changed, 0 insertions, 0 deletions