From: David S. Miller <davem@davemloft.net>
Date: Sat, 24 May 2014 18:06:19 +0000 (-0400)
Subject: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8646224cdb945eca4293e2131e5be47930ce3e80;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-davem' of git://git./linux/kernel/git/linville/wireless

John W. Linville says:

====================
pull request: wireless 2014-05-23

I have two more fixes intended for the 3.15 stream...

For the iwlwifi one, Emmanuel says:

"A race has been discovered in the beacon filtering code. Since the
fix is too big for 3.15, I disable here the feature."

For the bluetooth one, Gustavo says:

"This pull request contains a very important fix for 3.15. Here we fix the
permissions of a debugfs file that would otherwise allow unauthorized users
to write content to it."

Please let me know if there are problems!
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

8646224cdb945eca4293e2131e5be47930ce3e80