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>

1 files changed, 0 insertions, 12 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index e45fa5c0aa20..e824c1e74202 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -508,18 +508,6 @@ Who:	Kees Cook <keescook@chromium.org>
 
 ----------------------------
 
-What:   Removing the pn544 raw driver.
-When:   3.6
-Why:    With the introduction of the NFC HCI and SHDL kernel layers, pn544.c
-        is being replaced by pn544_hci.c which is accessible through the netlink
-        and socket NFC APIs. Moreover, pn544.c is outdated and does not seem to
-        work properly with the latest Android stacks.
-        Having 2 drivers for the same hardware is confusing and as such we
-        should only keep the one following the kernel NFC APIs.
-Who:    Samuel Ortiz <sameo@linux.intel.com>
-
-----------------------------
-
 What:   setitimer accepts user NULL pointer (value)
 When:   3.6
 Why:    setitimer is not returning -EFAULT if user pointer is NULL. This