From: David S. Miller Date: Fri, 10 Aug 2012 23:26:41 +0000 (-0700) Subject: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=69f1de1f7c3cac1741290cd38474caca77acd759;p=~shefty%2Frdma-dev.git Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless John W. Linville says: ==================== Here is a handful of fixes intended for 3.6. Daniel Drake offers a cfg80211 fix to consume pending events before taking a wireless device down. This prevents a resource leak. Stanislaw Gruszka gives us a fix for a NULL pointer dereference in rt61pci. Johannes Berg provides an iwlwifi patch to disable "greenfield" mode. Use of that mode was causing a rate scaling problem in for iwlwifi. ==================== Signed-off-by: David S. Miller --- 69f1de1f7c3cac1741290cd38474caca77acd759