diff options
author | David S. Miller <davem@davemloft.net> | 2012-09-30 08:30:16 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-30 08:30:16 +0200 |
commit | a248afdc1b5916c2bfd007233112333d85aa28f6 (patch) | |
tree | 49d4a0b8fdcf7624ea6b0bdf0af2567d7392210e /kernel/acct.c | |
parent | be2net: fixup log messages (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
download | linux-a248afdc1b5916c2bfd007233112333d85aa28f6.tar.xz linux-a248afdc1b5916c2bfd007233112333d85aa28f6.zip |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
Here is another batch of updates intended for 3.7...
Highlights include an hci_connect re-write in Bluetooth, HCI/LLC
layer separation in NFC, removal of the raw pn544 NFC driver, NFC LLCP
raw sockets support, improved IBSS auth frame handling in mac80211,
full-MAC AP mode notification support in mac80211, a lot of attention
paid to brcmfmac, and the usual level of updates to iwlwifi, ath9k,
mwifiex, and rt2x00, and various other updates.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/acct.c')
0 files changed, 0 insertions, 0 deletions